Enable conditional directives by default.

[email protected], [email protected], [email protected]

Review URL: https://codereview.chromium.org/1851753002 .

Author: floitschG

pkg/analysis_server/test/context_manager_test.dart

@@ -400,7 +400,6 @@ analyzer:
   language:
     enableGenericMethods: true
     enableAsync: false
-    enableConditionalDirectives: true
   errors:
     unused_local_variable: false
 linter:
@@ -426,7 +425,6 @@ linter:
     expect(context.analysisOptions.enableAsync, isFalse);
     // * from `.analysis_options`:
     expect(context.analysisOptions.enableGenericMethods, isTrue);
-    expect(context.analysisOptions.enableConditionalDirectives, isTrue);
 
     // * verify tests are excluded
     expect(

pkg/analyzer/lib/src/generated/engine.dart

@@ -1062,6 +1062,7 @@ abstract class AnalysisOptions {
   /**
    * Return `true` to enable interface libraries (DEP 40).
    */
+  @deprecated
   bool get enableConditionalDirectives;
 
   /**
@@ -1201,7 +1202,10 @@ class AnalysisOptionsImpl implements AnalysisOptions {
   /**
    * A flag indicating whether interface libraries are to be supported (DEP 40).
    */
-  bool enableConditionalDirectives = false;
+  bool get enableConditionalDirectives => true;
+
+  @deprecated
+  void set enableConditionalDirectives(_) {}
 
   /**
    * A flag indicating whether generic methods are to be supported (DEP 22).
@@ -1297,7 +1301,6 @@ class AnalysisOptionsImpl implements AnalysisOptions {
     dart2jsHint = options.dart2jsHint;
     enableAssertMessage = options.enableAssertMessage;
     enableAsync = options.enableAsync;
-    enableConditionalDirectives = options.enableConditionalDirectives;
     enableStrictCallChecks = options.enableStrictCallChecks;
     enableGenericMethods = options.enableGenericMethods;
     enableSuperMixins = options.enableSuperMixins;

pkg/analyzer/test/src/task/options_test.dart

@@ -68,7 +68,7 @@ analyzer:
   }
 
   test_configure_enableConditionalDirectives() {
-    expect(analysisOptions.enableConditionalDirectives, false);
+    expect(analysisOptions.enableConditionalDirectives, true);
     configureContext('''
 analyzer:
   language:

pkg/compiler/lib/src/commandline_options.dart

@@ -49,8 +49,9 @@ class Flags {
   static const String verbose = '--verbose';
   static const String version = '--version';
 
-  // Experimental flags.
   static const String conditionalDirectives = '--conditional-directives';
+
+  // Experimental flags.
   static const String genericMethodSyntax = '--generic-method-syntax';
 }
 

pkg/compiler/lib/src/dart2js.dart

@@ -326,7 +326,6 @@ Future<api.CompilationResult> compile(List<String> argv) {
     new OptionHandler('--out=.+|-o.*', setOutput, multipleArguments: true),
     new OptionHandler(Flags.allowMockCompilation, passThrough),
     new OptionHandler(Flags.fastStartup, passThrough),
-    new OptionHandler(Flags.conditionalDirectives, passThrough),
     new OptionHandler(Flags.genericMethodSyntax, passThrough),
     new OptionHandler('${Flags.minify}|-m', implyCompilation),
     new OptionHandler(Flags.preserveUris, passThrough),
@@ -364,6 +363,10 @@ Future<api.CompilationResult> compile(List<String> argv) {
     new OptionHandler(Flags.useContentSecurityPolicy, passThrough),
     new OptionHandler(Flags.enableExperimentalMirrors, passThrough),
     new OptionHandler(Flags.enableAssertMessage, passThrough),
+    // TODO(floitsch): remove conditional directives flag.
+    // We don't provide the info-message yet, since we haven't publicly
+    // launched the feature yet.
+    new OptionHandler(Flags.conditionalDirectives, (_) {}),
     new OptionHandler('--enable-async', (_) {
       diagnosticHandler.info(
           "Option '--enable-async' is no longer needed. "

pkg/compiler/lib/src/options.dart

@@ -14,9 +14,6 @@ import '../compiler.dart' show PackagesDiscoveryProvider;
 abstract class ParserOptions {
   const ParserOptions();
 
-  /// Support conditional directives, e.g., configurable imports.
-  bool get enableConditionalDirectives;
-
   /// Support parsing of generic method declarations, and invocations of
   /// methods where type arguments are passed.
   bool get enableGenericMethodSyntax;
@@ -148,9 +145,6 @@ class CompilerOptions implements DiagnosticOptions, ParserOptions {
   /// reason for why an assertion fails. (experimental)
   final bool enableAssertMessage;
 
-  /// Whether to enable the experimental conditional directives feature.
-  final bool enableConditionalDirectives;
-
   /// Support parsing of generic method declarations, and invocations of
   /// methods where type arguments are passed.
   final bool enableGenericMethodSyntax;
@@ -285,8 +279,6 @@ class CompilerOptions implements DiagnosticOptions, ParserOptions {
         emitJavaScript: !(_hasOption(options, '--output-type=dart') ||
             _hasOption(options, '--output-type=dart-multi')),
         enableAssertMessage: _hasOption(options, Flags.enableAssertMessage),
-        enableConditionalDirectives:
-            _hasOption(options, Flags.conditionalDirectives),
         enableGenericMethodSyntax:
             _hasOption(options, Flags.genericMethodSyntax),
         enableExperimentalMirrors:
@@ -354,7 +346,6 @@ class CompilerOptions implements DiagnosticOptions, ParserOptions {
       bool dumpInfo: false,
       bool emitJavaScript: true,
       bool enableAssertMessage: false,
-      bool enableConditionalDirectives: false,
       bool enableGenericMethodSyntax: false,
       bool enableExperimentalMirrors: false,
       bool enableMinification: false,
@@ -424,7 +415,6 @@ class CompilerOptions implements DiagnosticOptions, ParserOptions {
         dumpInfo: dumpInfo,
         emitJavaScript: emitJavaScript,
         enableAssertMessage: enableAssertMessage,
-        enableConditionalDirectives: enableConditionalDirectives,
         enableGenericMethodSyntax: enableGenericMethodSyntax,
         enableExperimentalMirrors: enableExperimentalMirrors,
         enableMinification: enableMinification,
@@ -475,7 +465,6 @@ class CompilerOptions implements DiagnosticOptions, ParserOptions {
       this.dumpInfo: false,
       this.emitJavaScript: true,
       this.enableAssertMessage: false,
-      this.enableConditionalDirectives: false,
       this.enableGenericMethodSyntax: false,
       this.enableExperimentalMirrors: false,
       this.enableMinification: false,

pkg/compiler/lib/src/parser/parser.dart

@@ -184,11 +184,9 @@ class Parser {
   Token parseConditionalUris(Token token) {
     listener.beginConditionalUris(token);
     int count = 0;
-    if (parserOptions.enableConditionalDirectives) {
-      while (optional('if', token)) {
-        count++;
-        token = parseConditionalUri(token);
-      }
+    while (optional('if', token)) {
+      count++;
+      token = parseConditionalUri(token);
     }
     listener.endConditionalUris(count);
     return token;

runtime/vm/parser.cc

@@ -44,7 +44,9 @@ namespace dart {
 DEFINE_FLAG(bool, enable_debug_break, false, "Allow use of break \"message\".");
 DEFINE_FLAG(bool, trace_parser, false, "Trace parser operations.");
 DEFINE_FLAG(bool, warn_mixin_typedef, true, "Warning on legacy mixin typedef.");
-DEFINE_FLAG(bool, conditional_directives, false,
+// TODO(floitsch): remove the conditional-directive flag, once we publicly
+// committed to the current version.
+DEFINE_FLAG(bool, conditional_directives, true,
     "Enable conditional directives");
 DEFINE_FLAG(bool, warn_super, false,
     "Warning if super initializer not last in initializer list.");

tests/compiler/dart2js/options_helper.dart

@@ -20,6 +20,5 @@ class MockDiagnosticOptions implements DiagnosticOptions {
 }
 
 class MockParserOptions implements ParserOptions {
-  bool get enableConditionalDirectives => true;
   bool get enableGenericMethodSyntax => true;
 }

tests/language/config_import_test.dart

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 //
-// DartOptions=-Did=true -Ddotted.id=some_string -Dlots.of.dots.In.id=false --conditional-directives
-// VMOptions=-Did=true -Ddotted.id=some_string -Dlots.of.dots.In.id=false --conditional-directives
+// DartOptions=-Did=true -Ddotted.id=some_string -Dlots.of.dots.In.id=false
+// VMOptions=-Did=true -Ddotted.id=some_string -Dlots.of.dots.In.id=false
 
 import 'package:expect/expect.dart';
 

tests/language/language_analyzer2.status

@@ -42,9 +42,6 @@ multiline_newline_test/06: MissingCompileTimeError # Issue 23888
 
 const_for_in_variable_test/01: MissingCompileTimeError # Issue 25161
 
-# Unsupported configuration specific imports.
-config_import_test: CompileTimeError # Issue 24579
-
 # Please add new failing tests before this line.
 # Section below is for invalid tests.
 #