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 #31640

Change-Id: I2db2e7ef6a324cbd5d369b807e331495fed167df
Reviewed-on: https://dart-review.googlesource.com/33121
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Jaime Wren <[email protected]>

Author: jwren

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<BenchMarkResult> run({
     bool quick: false,
-    bool previewDart2: false,
+    bool useCFE: false,
     bool verbose: false,
   });
 

pkg/analysis_server/benchmark/perf/benchmarks_impl.dart

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

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((_) {

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;
   }
 

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;
   }

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));

pkg/analysis_server/test/benchmarks_test.dart

@@ -38,15 +38,15 @@ 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,
           [
             path.join('benchmark', 'benchmarks.dart'),
             'run',
             '--repeat=1',
             '--quick',
-            '--preview-dart-2',
+            '--use-cfe',
             benchmarkId
           ],
           workingDirectory: _serverSourcePath,

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;
 }

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

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;
 }

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;
 }

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

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;
 }

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;
 }

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

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;
 }