From cd878bc433902612f36f6beb18aab8077542556a Mon Sep 17 00:00:00 2001 From: Jaime Wren Date: Mon, 8 Jan 2018 13:09:08 -0800 Subject: [PATCH] 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. See https://github.com/dart-lang/sdk/issues/31640 Change-Id: I2db2e7ef6a324cbd5d369b807e331495fed167df Reviewed-on: https://dart-review.googlesource.com/33121 Reviewed-by: Konstantin Shcheglov Commit-Queue: Jaime Wren --- pkg/analysis_server/benchmark/benchmarks.dart | 8 ++-- .../benchmark/perf/benchmarks_impl.dart | 8 ++-- .../benchmark/perf/memory_tests.dart | 4 +- .../lib/src/analysis_server.dart | 10 ++++- .../lib/src/server/driver.dart | 13 ++++-- .../lib/src/status/diagnostics.dart | 2 + pkg/analysis_server/test/benchmarks_test.dart | 4 +- .../analysis/analysis_options_test.dart | 6 +-- .../test/integration/analysis/error_test.dart | 7 ++- .../analysis/get_errors_nonStandard_sdk.dart | 11 +++-- .../integration/analysis/get_errors_test.dart | 6 +-- .../integration/analysis/get_hover_test.dart | 6 +-- .../analysis/get_imported_elements_test.dart | 7 ++- .../get_library_dependencies_test.dart | 7 ++- .../analysis/get_navigation_test.dart | 6 +-- .../analysis/get_reachable_sources_test.dart | 6 +-- .../integration/analysis/highlights_test.dart | 6 +-- .../analysis/highlights_test2.dart | 10 ++--- .../test/integration/analysis/lint_test.dart | 6 +-- .../integration/analysis/navigation_test.dart | 6 +-- .../analysis/occurrences_test.dart | 6 +-- .../integration/analysis/outline_test.dart | 6 +-- .../integration/analysis/overrides_test.dart | 6 +-- .../analysis/package_root_test.dart | 6 +-- .../analysis/reanalyze_concurrent_test.dart | 6 +-- .../integration/analysis/reanalyze_test.dart | 6 +-- .../analysis/set_analysis_roots_test.dart | 6 +-- .../set_general_subscriptions_test.dart | 7 ++- .../analysis/set_priority_files_test.dart | 6 +-- .../analysis/set_subscriptions_test.dart | 6 +-- .../analysis/update_content_list_test.dart | 6 +-- .../analysis/update_content_test.dart | 6 +-- .../analysis/update_options_test.dart | 6 +-- .../integration/analytics/enable_test.dart | 6 +-- .../analytics/is_enabled_test.dart | 6 +-- .../analytics/send_event_test.dart | 6 +-- .../analytics/send_timing_test.dart | 6 +-- .../completion/get_suggestions_test.dart | 6 +-- .../diagnostic/get_diagnostics_test.dart | 6 +-- .../diagnostic/get_server_port_test.dart | 6 +-- .../test/integration/edit/format_test.dart | 6 +-- .../integration/edit/get_assists_test.dart | 6 +-- .../edit/get_available_refactorings_test.dart | 7 ++- .../test/integration/edit/get_fixes_test.dart | 6 +-- .../edit/get_postfix_completion_test.dart | 6 +-- .../edit/get_refactoring_test.dart | 6 +-- .../edit/get_statement_completion_test.dart | 7 ++- .../edit/import_elements_test.dart | 7 ++- ...is_postfix_completion_applicable_test.dart | 6 +-- ...ist_postfix_completion_templates_test.dart | 6 +-- .../edit/organize_directives_test.dart | 6 +-- .../integration/edit/sort_members_test.dart | 6 +-- .../execution/create_context_test.dart | 6 +-- .../execution/delete_context_test.dart | 6 +-- .../integration/execution/map_uri_test.dart | 6 +-- .../execution/set_subscriptions_test.dart | 6 +-- .../kythe/get_kythe_entries_test.dart | 6 +-- .../search/find_element_references_test.dart | 6 +-- .../search/find_member_declarations_test.dart | 7 ++- .../search/find_member_references_test.dart | 6 +-- .../find_top_level_declarations_test.dart | 7 ++- .../search/get_type_hierarchy_test.dart | 6 +-- .../integration/server/get_version_test.dart | 6 +-- ...et_subscriptions_invalid_service_test.dart | 7 ++- .../server/set_subscriptions_test.dart | 6 +-- .../integration/server/shutdown_test.dart | 6 +-- .../test/integration/server/status_test.dart | 6 +-- .../support/integration_tests.dart | 16 +++---- pkg/analyzer/lib/src/context/builder.dart | 11 +++-- .../lib/src/dart/analysis/driver.dart | 2 +- .../src/dart/analysis/library_analyzer.dart | 13 +++--- ...e_compile_time_error_code_kernel_test.dart | 2 +- .../compile_time_error_code_kernel_test.dart | 2 +- .../error_suppression_kernel_test.dart | 2 +- .../test/generated/hint_code_kernel_test.dart | 2 +- .../generated/invalid_code_kernel_test.dart | 2 +- .../non_error_resolver_kernel_test.dart | 2 +- .../generated/non_hint_code_kernel_test.dart | 2 +- .../test/generated/resolver_kernel_test.dart | 2 +- .../test/generated/resolver_test_case.dart | 4 +- .../static_type_analyzer_kernel_test.dart | 2 +- .../static_type_warning_code_kernel_test.dart | 4 +- .../static_warning_code_kernel_test.dart | 2 +- .../generated/strong_mode_kernel_test.dart | 6 +-- pkg/analyzer/test/src/dart/analysis/base.dart | 13 ++++-- .../src/dart/analysis/driver_kernel_test.dart | 4 +- .../test/src/dart/analysis/driver_test.dart | 34 +++++++------- pkg/analyzer_cli/lib/src/driver.dart | 4 +- pkg/analyzer_cli/lib/src/options.dart | 13 +++++- pkg/analyzer_cli/test/driver_test.dart | 45 ++++++++++++++++++- pkg/analyzer_cli/test/options_test.dart | 9 +++- 91 files changed, 349 insertions(+), 277 deletions(-) diff --git a/pkg/analysis_server/benchmark/benchmarks.dart b/pkg/analysis_server/benchmark/benchmarks.dart index 815fe24aea8..ae06bdfa88a 100644 --- a/pkg/analysis_server/benchmark/benchmarks.dart +++ b/pkg/analysis_server/benchmark/benchmarks.dart @@ -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 run({ bool quick: false, - bool previewDart2: false, + bool useCFE: false, bool verbose: false, }); diff --git a/pkg/analysis_server/benchmark/perf/benchmarks_impl.dart b/pkg/analysis_server/benchmark/perf/benchmarks_impl.dart index f035551ac47..7640ff14fa6 100644 --- a/pkg/analysis_server/benchmark/perf/benchmarks_impl.dart +++ b/pkg/analysis_server/benchmark/perf/benchmarks_impl.dart @@ -28,7 +28,7 @@ class ColdAnalysisBenchmark extends Benchmark { @override Future 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 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; diff --git a/pkg/analysis_server/benchmark/perf/memory_tests.dart b/pkg/analysis_server/benchmark/perf/memory_tests.dart index 1971bf575ec..ed9a3d1a82d 100644 --- a/pkg/analysis_server/benchmark/perf/memory_tests.dart +++ b/pkg/analysis_server/benchmark/perf/memory_tests.dart @@ -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((_) { diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart index bd4e9c939e0..2108ce01c4e 100644 --- a/pkg/analysis_server/lib/src/analysis_server.dart +++ b/pkg/analysis_server/lib/src/analysis_server.dart @@ -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; } diff --git a/pkg/analysis_server/lib/src/server/driver.dart b/pkg/analysis_server/lib/src/server/driver.dart index 039d508bd01..594ca15c0f9 100644 --- a/pkg/analysis_server/lib/src/server/driver.dart +++ b/pkg/analysis_server/lib/src/server/driver.dart @@ -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; } diff --git a/pkg/analysis_server/lib/src/status/diagnostics.dart b/pkg/analysis_server/lib/src/status/diagnostics.dart index 5eb10380f43..e43652e33c6 100644 --- a/pkg/analysis_server/lib/src/status/diagnostics.dart +++ b/pkg/analysis_server/lib/src/status/diagnostics.dart @@ -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)); diff --git a/pkg/analysis_server/test/benchmarks_test.dart b/pkg/analysis_server/test/benchmarks_test.dart index 4cd4a46426a..4064bbbc22d 100644 --- a/pkg/analysis_server/test/benchmarks_test.dart +++ b/pkg/analysis_server/test/benchmarks_test.dart @@ -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, diff --git a/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart b/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart index f27c7b70b6c..b9c07480b85 100644 --- a/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart +++ b/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/error_test.dart b/pkg/analysis_server/test/integration/analysis/error_test.dart index fe968d7c548..c56fb039c36 100644 --- a/pkg/analysis_server/test/integration/analysis/error_test.dart +++ b/pkg/analysis_server/test/integration/analysis/error_test.dart @@ -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 diff --git a/pkg/analysis_server/test/integration/analysis/get_errors_nonStandard_sdk.dart b/pkg/analysis_server/test/integration/analysis/get_errors_nonStandard_sdk.dart index 0d18844d57d..d992b668240 100644 --- a/pkg/analysis_server/test/integration/analysis/get_errors_nonStandard_sdk.dart +++ b/pkg/analysis_server/test/integration/analysis/get_errors_nonStandard_sdk.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/get_errors_test.dart b/pkg/analysis_server/test/integration/analysis/get_errors_test.dart index c8a518f5da7..a4912ac6b2c 100644 --- a/pkg/analysis_server/test/integration/analysis/get_errors_test.dart +++ b/pkg/analysis_server/test/integration/analysis/get_errors_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/get_hover_test.dart b/pkg/analysis_server/test/integration/analysis/get_hover_test.dart index 352df8c5d02..f9a45f68bea 100644 --- a/pkg/analysis_server/test/integration/analysis/get_hover_test.dart +++ b/pkg/analysis_server/test/integration/analysis/get_hover_test.dart @@ -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 diff --git a/pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart b/pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart index 4823a1ad62a..655fa65e9ee 100644 --- a/pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart +++ b/pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/get_library_dependencies_test.dart b/pkg/analysis_server/test/integration/analysis/get_library_dependencies_test.dart index dda8e999438..318f244f93b 100644 --- a/pkg/analysis_server/test/integration/analysis/get_library_dependencies_test.dart +++ b/pkg/analysis_server/test/integration/analysis/get_library_dependencies_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/get_navigation_test.dart b/pkg/analysis_server/test/integration/analysis/get_navigation_test.dart index e9757fbadf8..a9d7bb7b104 100644 --- a/pkg/analysis_server/test/integration/analysis/get_navigation_test.dart +++ b/pkg/analysis_server/test/integration/analysis/get_navigation_test.dart @@ -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 diff --git a/pkg/analysis_server/test/integration/analysis/get_reachable_sources_test.dart b/pkg/analysis_server/test/integration/analysis/get_reachable_sources_test.dart index 532002caba4..7142da98209 100644 --- a/pkg/analysis_server/test/integration/analysis/get_reachable_sources_test.dart +++ b/pkg/analysis_server/test/integration/analysis/get_reachable_sources_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/highlights_test.dart b/pkg/analysis_server/test/integration/analysis/highlights_test.dart index 8091efae7c2..f52caaf7570 100644 --- a/pkg/analysis_server/test/integration/analysis/highlights_test.dart +++ b/pkg/analysis_server/test/integration/analysis/highlights_test.dart @@ -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 diff --git a/pkg/analysis_server/test/integration/analysis/highlights_test2.dart b/pkg/analysis_server/test/integration/analysis/highlights_test2.dart index 7d7314b3040..2157e77f6b6 100644 --- a/pkg/analysis_server/test/integration/analysis/highlights_test2.dart +++ b/pkg/analysis_server/test/integration/analysis/highlights_test2.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/lint_test.dart b/pkg/analysis_server/test/integration/analysis/lint_test.dart index 803c4a18f05..d217042777e 100644 --- a/pkg/analysis_server/test/integration/analysis/lint_test.dart +++ b/pkg/analysis_server/test/integration/analysis/lint_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/navigation_test.dart b/pkg/analysis_server/test/integration/analysis/navigation_test.dart index 52308a4366f..1eb6b71aa9c 100644 --- a/pkg/analysis_server/test/integration/analysis/navigation_test.dart +++ b/pkg/analysis_server/test/integration/analysis/navigation_test.dart @@ -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 diff --git a/pkg/analysis_server/test/integration/analysis/occurrences_test.dart b/pkg/analysis_server/test/integration/analysis/occurrences_test.dart index 97510f48b5f..5174ef4d9b1 100644 --- a/pkg/analysis_server/test/integration/analysis/occurrences_test.dart +++ b/pkg/analysis_server/test/integration/analysis/occurrences_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/outline_test.dart b/pkg/analysis_server/test/integration/analysis/outline_test.dart index 048ae85a169..0d5dc4307ff 100644 --- a/pkg/analysis_server/test/integration/analysis/outline_test.dart +++ b/pkg/analysis_server/test/integration/analysis/outline_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/overrides_test.dart b/pkg/analysis_server/test/integration/analysis/overrides_test.dart index ca1bdbea21e..39c4bb4ce3d 100644 --- a/pkg/analysis_server/test/integration/analysis/overrides_test.dart +++ b/pkg/analysis_server/test/integration/analysis/overrides_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/package_root_test.dart b/pkg/analysis_server/test/integration/analysis/package_root_test.dart index 8423906e400..5cca2f0011a 100644 --- a/pkg/analysis_server/test/integration/analysis/package_root_test.dart +++ b/pkg/analysis_server/test/integration/analysis/package_root_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/reanalyze_concurrent_test.dart b/pkg/analysis_server/test/integration/analysis/reanalyze_concurrent_test.dart index 792e2903e4d..7a726abba3a 100644 --- a/pkg/analysis_server/test/integration/analysis/reanalyze_concurrent_test.dart +++ b/pkg/analysis_server/test/integration/analysis/reanalyze_concurrent_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/reanalyze_test.dart b/pkg/analysis_server/test/integration/analysis/reanalyze_test.dart index 23693a7180c..319a4a425ff 100644 --- a/pkg/analysis_server/test/integration/analysis/reanalyze_test.dart +++ b/pkg/analysis_server/test/integration/analysis/reanalyze_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/set_analysis_roots_test.dart b/pkg/analysis_server/test/integration/analysis/set_analysis_roots_test.dart index 80869a9bc59..f9ebcb04ab4 100644 --- a/pkg/analysis_server/test/integration/analysis/set_analysis_roots_test.dart +++ b/pkg/analysis_server/test/integration/analysis/set_analysis_roots_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/set_general_subscriptions_test.dart b/pkg/analysis_server/test/integration/analysis/set_general_subscriptions_test.dart index 3ee248a6b04..ff147fcbaa9 100644 --- a/pkg/analysis_server/test/integration/analysis/set_general_subscriptions_test.dart +++ b/pkg/analysis_server/test/integration/analysis/set_general_subscriptions_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/set_priority_files_test.dart b/pkg/analysis_server/test/integration/analysis/set_priority_files_test.dart index 6a07229ba47..7d86706e51e 100644 --- a/pkg/analysis_server/test/integration/analysis/set_priority_files_test.dart +++ b/pkg/analysis_server/test/integration/analysis/set_priority_files_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/set_subscriptions_test.dart b/pkg/analysis_server/test/integration/analysis/set_subscriptions_test.dart index 1656f8083d6..02dcd05e3fc 100644 --- a/pkg/analysis_server/test/integration/analysis/set_subscriptions_test.dart +++ b/pkg/analysis_server/test/integration/analysis/set_subscriptions_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/update_content_list_test.dart b/pkg/analysis_server/test/integration/analysis/update_content_list_test.dart index c42ee65d722..42ef8688f9a 100644 --- a/pkg/analysis_server/test/integration/analysis/update_content_list_test.dart +++ b/pkg/analysis_server/test/integration/analysis/update_content_list_test.dart @@ -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 diff --git a/pkg/analysis_server/test/integration/analysis/update_content_test.dart b/pkg/analysis_server/test/integration/analysis/update_content_test.dart index ac2644bc47c..2238262f78d 100644 --- a/pkg/analysis_server/test/integration/analysis/update_content_test.dart +++ b/pkg/analysis_server/test/integration/analysis/update_content_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analysis/update_options_test.dart b/pkg/analysis_server/test/integration/analysis/update_options_test.dart index f4d9610845d..5d6b548a6c4 100644 --- a/pkg/analysis_server/test/integration/analysis/update_options_test.dart +++ b/pkg/analysis_server/test/integration/analysis/update_options_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analytics/enable_test.dart b/pkg/analysis_server/test/integration/analytics/enable_test.dart index d7dfdfd65fa..d04e9eea893 100644 --- a/pkg/analysis_server/test/integration/analytics/enable_test.dart +++ b/pkg/analysis_server/test/integration/analytics/enable_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analytics/is_enabled_test.dart b/pkg/analysis_server/test/integration/analytics/is_enabled_test.dart index daf089d711f..712a0507b2b 100644 --- a/pkg/analysis_server/test/integration/analytics/is_enabled_test.dart +++ b/pkg/analysis_server/test/integration/analytics/is_enabled_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analytics/send_event_test.dart b/pkg/analysis_server/test/integration/analytics/send_event_test.dart index 10986978d50..250790e74e7 100644 --- a/pkg/analysis_server/test/integration/analytics/send_event_test.dart +++ b/pkg/analysis_server/test/integration/analytics/send_event_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/analytics/send_timing_test.dart b/pkg/analysis_server/test/integration/analytics/send_timing_test.dart index 03ff2c473d2..ee8d8121f58 100644 --- a/pkg/analysis_server/test/integration/analytics/send_timing_test.dart +++ b/pkg/analysis_server/test/integration/analytics/send_timing_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/completion/get_suggestions_test.dart b/pkg/analysis_server/test/integration/completion/get_suggestions_test.dart index b3f4e1984c0..74aee23458a 100644 --- a/pkg/analysis_server/test/integration/completion/get_suggestions_test.dart +++ b/pkg/analysis_server/test/integration/completion/get_suggestions_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/diagnostic/get_diagnostics_test.dart b/pkg/analysis_server/test/integration/diagnostic/get_diagnostics_test.dart index 282b5f7cce9..897113f035d 100644 --- a/pkg/analysis_server/test/integration/diagnostic/get_diagnostics_test.dart +++ b/pkg/analysis_server/test/integration/diagnostic/get_diagnostics_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/diagnostic/get_server_port_test.dart b/pkg/analysis_server/test/integration/diagnostic/get_server_port_test.dart index d4009e6ca0a..bcce8b66f52 100644 --- a/pkg/analysis_server/test/integration/diagnostic/get_server_port_test.dart +++ b/pkg/analysis_server/test/integration/diagnostic/get_server_port_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/edit/format_test.dart b/pkg/analysis_server/test/integration/edit/format_test.dart index 4380afd55fa..9b161bab309 100644 --- a/pkg/analysis_server/test/integration/edit/format_test.dart +++ b/pkg/analysis_server/test/integration/edit/format_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/edit/get_assists_test.dart b/pkg/analysis_server/test/integration/edit/get_assists_test.dart index 0918d7b8193..b54ddd07193 100644 --- a/pkg/analysis_server/test/integration/edit/get_assists_test.dart +++ b/pkg/analysis_server/test/integration/edit/get_assists_test.dart @@ -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 diff --git a/pkg/analysis_server/test/integration/edit/get_available_refactorings_test.dart b/pkg/analysis_server/test/integration/edit/get_available_refactorings_test.dart index 0ae98080374..0d359f66119 100644 --- a/pkg/analysis_server/test/integration/edit/get_available_refactorings_test.dart +++ b/pkg/analysis_server/test/integration/edit/get_available_refactorings_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/edit/get_fixes_test.dart b/pkg/analysis_server/test/integration/edit/get_fixes_test.dart index fc111ae0c5e..c0e52b7d0a9 100644 --- a/pkg/analysis_server/test/integration/edit/get_fixes_test.dart +++ b/pkg/analysis_server/test/integration/edit/get_fixes_test.dart @@ -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 diff --git a/pkg/analysis_server/test/integration/edit/get_postfix_completion_test.dart b/pkg/analysis_server/test/integration/edit/get_postfix_completion_test.dart index 4a3e3e9aa7e..8e34a3bfff6 100644 --- a/pkg/analysis_server/test/integration/edit/get_postfix_completion_test.dart +++ b/pkg/analysis_server/test/integration/edit/get_postfix_completion_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/edit/get_refactoring_test.dart b/pkg/analysis_server/test/integration/edit/get_refactoring_test.dart index 59ac3a5a90d..f6469aa33a9 100644 --- a/pkg/analysis_server/test/integration/edit/get_refactoring_test.dart +++ b/pkg/analysis_server/test/integration/edit/get_refactoring_test.dart @@ -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 diff --git a/pkg/analysis_server/test/integration/edit/get_statement_completion_test.dart b/pkg/analysis_server/test/integration/edit/get_statement_completion_test.dart index 345c5cfdbf9..d462006e63a 100644 --- a/pkg/analysis_server/test/integration/edit/get_statement_completion_test.dart +++ b/pkg/analysis_server/test/integration/edit/get_statement_completion_test.dart @@ -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 diff --git a/pkg/analysis_server/test/integration/edit/import_elements_test.dart b/pkg/analysis_server/test/integration/edit/import_elements_test.dart index 4f3d3439cc5..da142fcb759 100644 --- a/pkg/analysis_server/test/integration/edit/import_elements_test.dart +++ b/pkg/analysis_server/test/integration/edit/import_elements_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/edit/is_postfix_completion_applicable_test.dart b/pkg/analysis_server/test/integration/edit/is_postfix_completion_applicable_test.dart index afda363d9e1..32f59cbfa3e 100644 --- a/pkg/analysis_server/test/integration/edit/is_postfix_completion_applicable_test.dart +++ b/pkg/analysis_server/test/integration/edit/is_postfix_completion_applicable_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/edit/list_postfix_completion_templates_test.dart b/pkg/analysis_server/test/integration/edit/list_postfix_completion_templates_test.dart index b5f52b7e267..3caf5f8077b 100644 --- a/pkg/analysis_server/test/integration/edit/list_postfix_completion_templates_test.dart +++ b/pkg/analysis_server/test/integration/edit/list_postfix_completion_templates_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/edit/organize_directives_test.dart b/pkg/analysis_server/test/integration/edit/organize_directives_test.dart index cc942358f90..4d519e95e3b 100644 --- a/pkg/analysis_server/test/integration/edit/organize_directives_test.dart +++ b/pkg/analysis_server/test/integration/edit/organize_directives_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/edit/sort_members_test.dart b/pkg/analysis_server/test/integration/edit/sort_members_test.dart index 277c168a0df..da09496ee37 100644 --- a/pkg/analysis_server/test/integration/edit/sort_members_test.dart +++ b/pkg/analysis_server/test/integration/edit/sort_members_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/execution/create_context_test.dart b/pkg/analysis_server/test/integration/execution/create_context_test.dart index 841a427b685..2604eab0763 100644 --- a/pkg/analysis_server/test/integration/execution/create_context_test.dart +++ b/pkg/analysis_server/test/integration/execution/create_context_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/execution/delete_context_test.dart b/pkg/analysis_server/test/integration/execution/delete_context_test.dart index 527706931db..3cf0e19b052 100644 --- a/pkg/analysis_server/test/integration/execution/delete_context_test.dart +++ b/pkg/analysis_server/test/integration/execution/delete_context_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/execution/map_uri_test.dart b/pkg/analysis_server/test/integration/execution/map_uri_test.dart index 8b186cb1e81..9990a230b25 100644 --- a/pkg/analysis_server/test/integration/execution/map_uri_test.dart +++ b/pkg/analysis_server/test/integration/execution/map_uri_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/execution/set_subscriptions_test.dart b/pkg/analysis_server/test/integration/execution/set_subscriptions_test.dart index 09835d7a319..a715eddbc91 100644 --- a/pkg/analysis_server/test/integration/execution/set_subscriptions_test.dart +++ b/pkg/analysis_server/test/integration/execution/set_subscriptions_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/kythe/get_kythe_entries_test.dart b/pkg/analysis_server/test/integration/kythe/get_kythe_entries_test.dart index 13ae694d7a4..823ac4d7d42 100644 --- a/pkg/analysis_server/test/integration/kythe/get_kythe_entries_test.dart +++ b/pkg/analysis_server/test/integration/kythe/get_kythe_entries_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/search/find_element_references_test.dart b/pkg/analysis_server/test/integration/search/find_element_references_test.dart index 823e17fa1fe..bc24fb890de 100644 --- a/pkg/analysis_server/test/integration/search/find_element_references_test.dart +++ b/pkg/analysis_server/test/integration/search/find_element_references_test.dart @@ -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 diff --git a/pkg/analysis_server/test/integration/search/find_member_declarations_test.dart b/pkg/analysis_server/test/integration/search/find_member_declarations_test.dart index babe602f843..38f0c677abc 100644 --- a/pkg/analysis_server/test/integration/search/find_member_declarations_test.dart +++ b/pkg/analysis_server/test/integration/search/find_member_declarations_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/search/find_member_references_test.dart b/pkg/analysis_server/test/integration/search/find_member_references_test.dart index 9c9cac3e706..3541b6f18b3 100644 --- a/pkg/analysis_server/test/integration/search/find_member_references_test.dart +++ b/pkg/analysis_server/test/integration/search/find_member_references_test.dart @@ -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 diff --git a/pkg/analysis_server/test/integration/search/find_top_level_declarations_test.dart b/pkg/analysis_server/test/integration/search/find_top_level_declarations_test.dart index a422c7aeb22..4a2a41de879 100644 --- a/pkg/analysis_server/test/integration/search/find_top_level_declarations_test.dart +++ b/pkg/analysis_server/test/integration/search/find_top_level_declarations_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart b/pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart index 656ed0afddd..7970c1d3a25 100644 --- a/pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart +++ b/pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart @@ -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 diff --git a/pkg/analysis_server/test/integration/server/get_version_test.dart b/pkg/analysis_server/test/integration/server/get_version_test.dart index 485b771c820..2a855440c54 100644 --- a/pkg/analysis_server/test/integration/server/get_version_test.dart +++ b/pkg/analysis_server/test/integration/server/get_version_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/server/set_subscriptions_invalid_service_test.dart b/pkg/analysis_server/test/integration/server/set_subscriptions_invalid_service_test.dart index d86e9a046eb..1dbb9db6457 100644 --- a/pkg/analysis_server/test/integration/server/set_subscriptions_invalid_service_test.dart +++ b/pkg/analysis_server/test/integration/server/set_subscriptions_invalid_service_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/server/set_subscriptions_test.dart b/pkg/analysis_server/test/integration/server/set_subscriptions_test.dart index d1472a27cfd..afae71ba24c 100644 --- a/pkg/analysis_server/test/integration/server/set_subscriptions_test.dart +++ b/pkg/analysis_server/test/integration/server/set_subscriptions_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/server/shutdown_test.dart b/pkg/analysis_server/test/integration/server/shutdown_test.dart index 8f24bdb820f..a68bf82a9a8 100644 --- a/pkg/analysis_server/test/integration/server/shutdown_test.dart +++ b/pkg/analysis_server/test/integration/server/shutdown_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/server/status_test.dart b/pkg/analysis_server/test/integration/server/status_test.dart index 1ffa86a02c2..dab8eaa05ca 100644 --- a/pkg/analysis_server/test/integration/server/status_test.dart +++ b/pkg/analysis_server/test/integration/server/status_test.dart @@ -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; } diff --git a/pkg/analysis_server/test/integration/support/integration_tests.dart b/pkg/analysis_server/test/integration/support/integration_tests.dart index f8dc21aa072..2031b3c7b0f 100644 --- a/pkg/analysis_server/test/integration/support/integration_tests.dart +++ b/pkg/analysis_server/test/integration/support/integration_tests.dart @@ -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 diff --git a/pkg/analyzer/lib/src/context/builder.dart b/pkg/analyzer/lib/src/context/builder.dart index 6bccdb77aec..8b78044eece 100644 --- a/pkg/analyzer/lib/src/context/builder.dart +++ b/pkg/analyzer/lib/src/context/builder.dart @@ -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) { diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart index 588c842c7ea..58388f8b5ae 100644 --- a/pkg/analyzer/lib/src/dart/analysis/driver.dart +++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart @@ -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); diff --git a/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart b/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart index 8c3fe086dfa..defa8cc2527 100644 --- a/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart +++ b/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart @@ -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> 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); diff --git a/pkg/analyzer/test/generated/checked_mode_compile_time_error_code_kernel_test.dart b/pkg/analyzer/test/generated/checked_mode_compile_time_error_code_kernel_test.dart index 4f7a9c209c0..1a4f23f505b 100644 --- a/pkg/analyzer/test/generated/checked_mode_compile_time_error_code_kernel_test.dart +++ b/pkg/analyzer/test/generated/checked_mode_compile_time_error_code_kernel_test.dart @@ -19,7 +19,7 @@ class CheckedModeCompileTimeErrorCodeTest_Kernel bool get enableKernelDriver => true; @override - bool get previewDart2 => true; + bool get useCFE => true; @failingTest @override diff --git a/pkg/analyzer/test/generated/compile_time_error_code_kernel_test.dart b/pkg/analyzer/test/generated/compile_time_error_code_kernel_test.dart index 0d6afa0ce90..78e9c2c7b1a 100644 --- a/pkg/analyzer/test/generated/compile_time_error_code_kernel_test.dart +++ b/pkg/analyzer/test/generated/compile_time_error_code_kernel_test.dart @@ -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 diff --git a/pkg/analyzer/test/generated/error_suppression_kernel_test.dart b/pkg/analyzer/test/generated/error_suppression_kernel_test.dart index 3e7843cacc2..410dd7e3073 100644 --- a/pkg/analyzer/test/generated/error_suppression_kernel_test.dart +++ b/pkg/analyzer/test/generated/error_suppression_kernel_test.dart @@ -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 diff --git a/pkg/analyzer/test/generated/hint_code_kernel_test.dart b/pkg/analyzer/test/generated/hint_code_kernel_test.dart index 7854a5cdd30..ccab1d27245 100644 --- a/pkg/analyzer/test/generated/hint_code_kernel_test.dart +++ b/pkg/analyzer/test/generated/hint_code_kernel_test.dart @@ -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 diff --git a/pkg/analyzer/test/generated/invalid_code_kernel_test.dart b/pkg/analyzer/test/generated/invalid_code_kernel_test.dart index cacac441afd..bf1cd61ef18 100644 --- a/pkg/analyzer/test/generated/invalid_code_kernel_test.dart +++ b/pkg/analyzer/test/generated/invalid_code_kernel_test.dart @@ -21,7 +21,7 @@ class InvalidCodeTest_Kernel extends InvalidCodeTest { bool get enableNewAnalysisDriver => true; @override - bool get previewDart2 => true; + bool get useCFE => true; @failingTest @override diff --git a/pkg/analyzer/test/generated/non_error_resolver_kernel_test.dart b/pkg/analyzer/test/generated/non_error_resolver_kernel_test.dart index f91cf220363..04479409830 100644 --- a/pkg/analyzer/test/generated/non_error_resolver_kernel_test.dart +++ b/pkg/analyzer/test/generated/non_error_resolver_kernel_test.dart @@ -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 diff --git a/pkg/analyzer/test/generated/non_hint_code_kernel_test.dart b/pkg/analyzer/test/generated/non_hint_code_kernel_test.dart index c61a040e86e..e8a95d5e54b 100644 --- a/pkg/analyzer/test/generated/non_hint_code_kernel_test.dart +++ b/pkg/analyzer/test/generated/non_hint_code_kernel_test.dart @@ -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 diff --git a/pkg/analyzer/test/generated/resolver_kernel_test.dart b/pkg/analyzer/test/generated/resolver_kernel_test.dart index ef8abbbc09a..bc11b8b89eb 100644 --- a/pkg/analyzer/test/generated/resolver_kernel_test.dart +++ b/pkg/analyzer/test/generated/resolver_kernel_test.dart @@ -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 diff --git a/pkg/analyzer/test/generated/resolver_test_case.dart b/pkg/analyzer/test/generated/resolver_test_case.dart index 49548e57117..b2690a059a5 100644 --- a/pkg/analyzer/test/generated/resolver_test_case.dart +++ b/pkg/analyzer/test/generated/resolver_test_case.dart @@ -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; diff --git a/pkg/analyzer/test/generated/static_type_analyzer_kernel_test.dart b/pkg/analyzer/test/generated/static_type_analyzer_kernel_test.dart index 34e8ad9b3e1..3081d1de0b6 100644 --- a/pkg/analyzer/test/generated/static_type_analyzer_kernel_test.dart +++ b/pkg/analyzer/test/generated/static_type_analyzer_kernel_test.dart @@ -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 diff --git a/pkg/analyzer/test/generated/static_type_warning_code_kernel_test.dart b/pkg/analyzer/test/generated/static_type_warning_code_kernel_test.dart index 3f1eb5a593d..d48655dc224 100644 --- a/pkg/analyzer/test/generated/static_type_warning_code_kernel_test.dart +++ b/pkg/analyzer/test/generated/static_type_warning_code_kernel_test.dart @@ -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 diff --git a/pkg/analyzer/test/generated/static_warning_code_kernel_test.dart b/pkg/analyzer/test/generated/static_warning_code_kernel_test.dart index a6292e40353..2066b768ecf 100644 --- a/pkg/analyzer/test/generated/static_warning_code_kernel_test.dart +++ b/pkg/analyzer/test/generated/static_warning_code_kernel_test.dart @@ -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 diff --git a/pkg/analyzer/test/generated/strong_mode_kernel_test.dart b/pkg/analyzer/test/generated/strong_mode_kernel_test.dart index a43b59a0877..2c4805315ab 100644 --- a/pkg/analyzer/test/generated/strong_mode_kernel_test.dart +++ b/pkg/analyzer/test/generated/strong_mode_kernel_test.dart @@ -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; } diff --git a/pkg/analyzer/test/src/dart/analysis/base.dart b/pkg/analyzer/test/src/dart/analysis/base.dart index 33f83e8e7a8..41f72c996f1 100644 --- a/pkg/analyzer/test/src/dart/analysis/base.dart +++ b/pkg/analyzer/test/src/dart/analysis/base.dart @@ -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); diff --git a/pkg/analyzer/test/src/dart/analysis/driver_kernel_test.dart b/pkg/analyzer/test/src/dart/analysis/driver_kernel_test.dart index b93ec330772..deeac1db139 100644 --- a/pkg/analyzer/test/src/dart/analysis/driver_kernel_test.dart +++ b/pkg/analyzer/test/src/dart/analysis/driver_kernel_test.dart @@ -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 diff --git a/pkg/analyzer/test/src/dart/analysis/driver_test.dart b/pkg/analyzer/test/src/dart/analysis/driver_test.dart index 78c8acd59ef..f77322f97d3 100644 --- a/pkg/analyzer/test/src/dart/analysis/driver_test.dart +++ b/pkg/analyzer/test/src/dart/analysis/driver_test.dart @@ -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 { 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 { var invokeTypeStr = '(int, double) → Map'; expect(invocation.staticType.toString(), 'Map'); 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 a, U b) {} List 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 a, U b) {} List 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); diff --git a/pkg/analyzer_cli/lib/src/driver.dart b/pkg/analyzer_cli/lib/src/driver.dart index 103d93fb3b2..9f298d5ca74 100644 --- a/pkg/analyzer_cli/lib/src/driver.dart +++ b/pkg/analyzer_cli/lib/src/driver.dart @@ -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; } diff --git a/pkg/analyzer_cli/lib/src/options.dart b/pkg/analyzer_cli/lib/src/options.dart index 1ab9c6464ba..cfa64ece2a2 100644 --- a/pkg/analyzer_cli/lib/src/options.dart +++ b/pkg/analyzer_cli/lib/src/options.dart @@ -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); diff --git a/pkg/analyzer_cli/test/driver_test.dart b/pkg/analyzer_cli/test/driver_test.dart index 42230ab6bbd..cd9077945a6 100644 --- a/pkg/analyzer_cli/test/driver_test.dart +++ b/pkg/analyzer_cli/test/driver_test.dart @@ -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 { diff --git a/pkg/analyzer_cli/test/options_test.dart b/pkg/analyzer_cli/test/options_test.dart index acfac627f1f..71a16731b86 100644 --- a/pkg/analyzer_cli/test/options_test.dart +++ b/pkg/analyzer_cli/test/options_test.dart @@ -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);