Revert "Remove all support for all strong-mode analysis options"

This reverts ea120b5 Change-Id: I97a1bf6ced06bf8bcab50a2fdb41732f13182a84 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/276026 Reviewed-by: Siva Annamalai <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
dart-lang · Dec 16, 2022 · 94f20d7 · 94f20d7
1 parent d0d2e25
commit 94f20d7
Show file tree

Hide file tree

Showing 50 changed files with 1,851 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -71,13 +71,6 @@
 
 ### Tools
 
-#### Analyzer
-
-- Remove deprecated 'strong-mode' analysis options from `analysis_options.yaml`
-  files. These options are replaced by the supported "strict" options
-  documented at
-  [dart.dev](https://dart.dev/guides/language/analysis-options#enabling-additional-type-checks).
-
 #### Linter
 
 Updates the Linter to `1.32.0`, which includes changes that

diff --git a/pkg/analysis_server/lib/src/services/completion/yaml/analysis_options_generator.dart b/pkg/analysis_server/lib/src/services/completion/yaml/analysis_options_generator.dart
@@ -34,6 +34,11 @@ class AnalysisOptionsGenerator extends YamlCompletionGenerator {
       }),
       AnalyzerOptions.plugins: EmptyProducer(),
       AnalyzerOptions.propagateLinterExceptions: EmptyProducer(),
+      AnalyzerOptions.strongMode: MapProducer({
+        AnalyzerOptions.declarationCasts: EmptyProducer(),
+        AnalyzerOptions.implicitCasts: EmptyProducer(),
+        AnalyzerOptions.implicitDynamic: EmptyProducer(),
+      }),
     }),
     AnalyzerOptions.codeStyle: MapProducer({
       AnalyzerOptions.format: BooleanProducer(),

diff --git a/pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml b/pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml
@@ -43,6 +43,9 @@ AnalysisOptionsErrorCode.PARSE_ERROR:
 AnalysisOptionsHintCode.PREVIEW_DART_2_SETTING_DEPRECATED:
   status: needsFix
   notes: Fixed.
+AnalysisOptionsHintCode.STRONG_MODE_SETTING_DEPRECATED:
+  status: needsFix
+  notes: Fixed.
 AnalysisOptionsWarningCode.INCLUDE_FILE_NOT_FOUND:
   status: noFix
   notes: |-
@@ -63,6 +66,10 @@ AnalysisOptionsWarningCode.INVALID_OPTION:
     replace the invalid option with the selected replacement.
 AnalysisOptionsWarningCode.INVALID_SECTION_FORMAT:
   status: needsEvaluation
+AnalysisOptionsWarningCode.SPEC_MODE_REMOVED:
+  status: needsFix
+  notes: |-
+    Provide a fix to remove the deprecated setting.
 AnalysisOptionsWarningCode.UNRECOGNIZED_ERROR_CODE:
   status: needsEvaluation
 AnalysisOptionsWarningCode.UNSUPPORTED_OPTION_WITH_LEGAL_VALUE:
@@ -1680,6 +1687,56 @@ HintCode.UNUSED_RESULT_WITH_MESSAGE:
     There is no predictable common way in which a result _should_ be used.
 HintCode.UNUSED_SHOWN_NAME:
   status: hasFix
+LanguageCode.IMPLICIT_DYNAMIC_FIELD:
+  status: needsFix
+  notes: |-
+    The correction says to add an explicit type or remove implicit-dynamic from
+    analysis options. We can add a fix to add an explicit `dynamic`.
+LanguageCode.IMPLICIT_DYNAMIC_FUNCTION:
+  status: needsFix
+  notes: |-
+    The correction says to add an explicit type or remove implicit-dynamic from
+    analysis options. We can add a fix to add an explicit `dynamic`.
+LanguageCode.IMPLICIT_DYNAMIC_INVOKE:
+  status: needsFix
+  notes: |-
+    The correction says to add an explicit type or remove implicit-dynamic from
+    analysis options. We can add a fix to add an explicit `dynamic`.
+LanguageCode.IMPLICIT_DYNAMIC_LIST_LITERAL:
+  status: needsFix
+  notes: |-
+    The correction says to add an explicit type or remove implicit-dynamic from
+    analysis options. We can add a fix to add an explicit `dynamic`.
+LanguageCode.IMPLICIT_DYNAMIC_MAP_LITERAL:
+  status: needsFix
+  notes: |-
+    The correction says to add an explicit type or remove implicit-dynamic from
+    analysis options. We can add a fix to add an explicit `dynamic`.
+LanguageCode.IMPLICIT_DYNAMIC_METHOD:
+  status: needsFix
+  notes: |-
+    The correction says to add an explicit type or remove implicit-dynamic from
+    analysis options. We can add a fix to add an explicit `dynamic`.
+LanguageCode.IMPLICIT_DYNAMIC_PARAMETER:
+  status: needsFix
+  notes: |-
+    The correction says to add an explicit type or remove implicit-dynamic from
+    analysis options. We can add a fix to add an explicit `dynamic`.
+LanguageCode.IMPLICIT_DYNAMIC_RETURN:
+  status: needsFix
+  notes: |-
+    The correction says to add an explicit type or remove implicit-dynamic from
+    analysis options. We can add a fix to add an explicit `dynamic`.
+LanguageCode.IMPLICIT_DYNAMIC_TYPE:
+  status: needsFix
+  notes: |-
+    The correction says to add an explicit type or remove implicit-dynamic from
+    analysis options. We can add a fix to add an explicit `dynamic`.
+LanguageCode.IMPLICIT_DYNAMIC_VARIABLE:
+  status: needsFix
+  notes: |-
+    The correction says to add an explicit type or remove implicit-dynamic from
+    analysis options. We can add a fix to add an explicit `dynamic`.
 LintCode.always_declare_return_types:
   status: hasFix
 LintCode.always_put_control_body_on_new_line:

diff --git a/pkg/analysis_server/lib/src/services/correction/fix/analysis_options/fix_generator.dart b/pkg/analysis_server/lib/src/services/correction/fix/analysis_options/fix_generator.dart
@@ -65,6 +65,9 @@ class AnalysisOptionsFixGenerator {
     if (errorCode ==
         AnalysisOptionsHintCode.PREVIEW_DART_2_SETTING_DEPRECATED) {
       await _addFix_removeSetting(coveringNodePath);
+    } else if (errorCode ==
+        AnalysisOptionsHintCode.STRONG_MODE_SETTING_DEPRECATED) {
+      await _addFix_removeSetting(coveringNodePath);
     } else if (errorCode == DEPRECATED_LINT_HINT) {
       await _addFix_removeLint(coveringNodePath);
 //    } else if (errorCode == AnalysisOptionsWarningCode.INCLUDED_FILE_WARNING) {

diff --git a/pkg/analysis_server/lib/src/status/diagnostics.dart b/pkg/analysis_server/lib/src/status/diagnostics.dart
@@ -452,6 +452,8 @@ class ContextsPage extends DiagnosticPageWithNav {
   String describe(AnalysisOptionsImpl options) {
     var b = StringBuffer();
 
+    b.write(writeOption('Implicit dynamic', options.implicitDynamic));
+    b.write(writeOption('Implicit casts', options.implicitCasts));
     b.write(writeOption('Feature set', options.contextFeatures.toString()));
     b.write('<br>');
 

diff --git a/pkg/analysis_server/test/abstract_context.dart b/pkg/analysis_server/test/abstract_context.dart
@@ -105,11 +105,12 @@ class AbstractContextTest with ResourceProviderMixin {
   void createAnalysisOptionsFile({
     List<String>? experiments,
     List<String>? cannotIgnore,
+    bool? implicitCasts,
     List<String>? lints,
   }) {
     var buffer = StringBuffer();
 
-    if (experiments != null || cannotIgnore != null) {
+    if (experiments != null || implicitCasts != null || cannotIgnore != null) {
       buffer.writeln('analyzer:');
     }
 
@@ -120,6 +121,11 @@ class AbstractContextTest with ResourceProviderMixin {
       }
     }
 
+    if (implicitCasts != null) {
+      buffer.writeln('  strong-mode:');
+      buffer.writeln('    implicit-casts: $implicitCasts');
+    }
+
     if (cannotIgnore != null) {
       buffer.writeln('  cannot-ignore:');
       for (var unignorable in cannotIgnore) {

diff --git a/pkg/analysis_server/test/analysis/notification_analysis_options_test.dart b/pkg/analysis_server/test/analysis/notification_analysis_options_test.dart
@@ -28,7 +28,7 @@ class AnalysisOptionsFileNotificationTest extends PubPackageAnalysisServerTest {
   final testSource = '''
 void f() {
   var x = '';
-  int y = x; // Not assignable.
+  int y = x; // Not assignable in strong-mode
   print(y);
 }''';
 

diff --git a/pkg/analysis_server/test/analysis_server_base.dart b/pkg/analysis_server/test/analysis_server_base.dart
@@ -27,13 +27,17 @@ import 'src/utilities/mock_packages.dart';
 /// TODO(scheglov) this is duplicate
 class AnalysisOptionsFileConfig {
   final List<String> experiments;
+  final bool implicitCasts;
+  final bool implicitDynamic;
   final List<String> lints;
   final bool strictCasts;
   final bool strictInference;
   final bool strictRawTypes;
 
   AnalysisOptionsFileConfig({
     this.experiments = const [],
+    this.implicitCasts = true,
+    this.implicitDynamic = true,
     this.lints = const [],
     this.strictCasts = false,
     this.strictInference = false,
@@ -54,6 +58,9 @@ class AnalysisOptionsFileConfig {
     buffer.writeln('    strict-casts: $strictCasts');
     buffer.writeln('    strict-inference: $strictInference');
     buffer.writeln('    strict-raw-types: $strictRawTypes');
+    buffer.writeln('  strong-mode:');
+    buffer.writeln('    implicit-casts: $implicitCasts');
+    buffer.writeln('    implicit-dynamic: $implicitDynamic');
 
     buffer.writeln('linter:');
     buffer.writeln('  rules:');

diff --git a/pkg/analysis_server/test/src/analytics/analytics_manager_test.dart b/pkg/analysis_server/test/src/analytics/analytics_manager_test.dart
@@ -359,12 +359,13 @@ class AnalyticsManagerTest with ResourceProviderMixin {
     String? path,
     Map<String, String>? errors,
     List<String>? experiments,
+    bool? implicitCasts,
     List<String>? lints,
   }) {
     path ??= '$testPackageRootPath/analysis_options.yaml';
     var buffer = StringBuffer();
 
-    if (errors != null || experiments != null) {
+    if (errors != null || experiments != null || implicitCasts != null) {
       buffer.writeln('analyzer:');
     }
 
@@ -382,6 +383,11 @@ class AnalyticsManagerTest with ResourceProviderMixin {
       }
     }
 
+    if (implicitCasts != null) {
+      buffer.writeln('  strong-mode:');
+      buffer.writeln('    implicit-casts: $implicitCasts');
+    }
+
     if (lints != null) {
       buffer.writeln('linter:');
       buffer.writeln('  rules:');

diff --git a/pkg/analysis_server/test/src/flutter/flutter_outline_notification_test.dart b/pkg/analysis_server/test/src/flutter/flutter_outline_notification_test.dart
@@ -69,7 +69,7 @@ class FlutterNotificationOutlineTest extends PubPackageAnalysisServerTest {
     );
     newAnalysisOptionsYamlFile(testPackageRootPath, '''
 analyzer:
-  language: true
+  strong-mode: true
 ''');
     await pumpEventQueue();
     await server.onAnalysisComplete;

diff --git a/...nalysis_server/test/src/services/correction/fix/analysis_options/remove_setting_test.dart b/...nalysis_server/test/src/services/correction/fix/analysis_options/remove_setting_test.dart
@@ -62,4 +62,11 @@ analyzer:
 ''', '''
 ''');
   }
+
+  Future<void> test_strong_mode_settings_deprecated() async {
+    await assertHasFix('''
+analyzer:
+  strong-mode: true
+''', '');
+  }
 }
diff --git a/pkg/analysis_server/test/src/services/correction/fix/change_type_annotation_test.dart b/pkg/analysis_server/test/src/services/correction/fix/change_type_annotation_test.dart
@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analysis_server/src/services/correction/fix.dart';
+import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -118,4 +119,16 @@ f() {
 }
 ''');
   }
+
+  Future<void> test_synthetic_implicitCast() async {
+    createAnalysisOptionsFile(implicitCasts: false);
+    await resolveTestCode('''
+int foo =
+''');
+    await assertNoFix(
+      errorFilter: (e) {
+        return e.errorCode == CompileTimeErrorCode.INVALID_ASSIGNMENT;
+      },
+    );
+  }
 }
diff --git a/pkg/analyzer/lib/src/analysis_options/error/option_codes.g.dart b/pkg/analyzer/lib/src/analysis_options/error/option_codes.g.dart
@@ -68,6 +68,15 @@ class AnalysisOptionsHintCode extends ErrorCode {
     correctionMessage: "It is no longer necessary to explicitly enable Dart 2.",
   );
 
+  ///  An error code indicating that strong-mode: true is deprecated.
+  static const AnalysisOptionsHintCode STRONG_MODE_SETTING_DEPRECATED =
+      AnalysisOptionsHintCode(
+    'STRONG_MODE_SETTING_DEPRECATED',
+    "The 'strong-mode: true' setting is deprecated.",
+    correctionMessage:
+        "It is no longer necessary to explicitly enable strong mode.",
+  );
+
   /// Initialize a newly created error code to have the given [name].
   const AnalysisOptionsHintCode(
     String name,
@@ -137,6 +146,16 @@ class AnalysisOptionsWarningCode extends ErrorCode {
     "Invalid format for the '{0}' section.",
   );
 
+  ///  An error code indicating that strong-mode: false is has been removed.
+  static const AnalysisOptionsWarningCode SPEC_MODE_REMOVED =
+      AnalysisOptionsWarningCode(
+    'SPEC_MODE_REMOVED',
+    "The option 'strong-mode: false' is no longer supported.",
+    correctionMessage:
+        "It's recommended to remove the 'strong-mode:' setting (and make your "
+        "code Dart 2 compliant).",
+  );
+
   ///  An error code indicating that an unrecognized error code is being used to
   ///  specify an error filter.
   ///

diff --git a/pkg/analyzer/lib/src/context/context.dart b/pkg/analyzer/lib/src/context/context.dart
@@ -41,11 +41,13 @@ class AnalysisContextImpl implements AnalysisContext {
 
     // TODO() remove this method as well
     _typeSystemLegacy?.updateOptions(
+      implicitCasts: analysisOptions.implicitCasts,
       strictCasts: analysisOptions.strictCasts,
       strictInference: analysisOptions.strictInference,
     );
 
     _typeSystemNonNullableByDefault?.updateOptions(
+      implicitCasts: analysisOptions.implicitCasts,
       strictCasts: analysisOptions.strictCasts,
       strictInference: analysisOptions.strictInference,
     );
@@ -89,13 +91,15 @@ class AnalysisContextImpl implements AnalysisContext {
     }
 
     _typeSystemLegacy = TypeSystemImpl(
+      implicitCasts: analysisOptions.implicitCasts,
       isNonNullableByDefault: false,
       strictCasts: analysisOptions.strictCasts,
       strictInference: analysisOptions.strictInference,
       typeProvider: legacy,
     );
 
     _typeSystemNonNullableByDefault = TypeSystemImpl(
+      implicitCasts: analysisOptions.implicitCasts,
       isNonNullableByDefault: true,
       strictCasts: analysisOptions.strictCasts,
       strictInference: analysisOptions.strictInference,

diff --git a/pkg/analyzer/lib/src/dart/constant/value.dart b/pkg/analyzer/lib/src/dart/constant/value.dart
@@ -527,6 +527,7 @@ class DartObjectImpl implements DartObject {
   DartObjectImpl isIdentical(
       TypeProvider typeProvider, DartObjectImpl rightOperand) {
     var typeSystem = TypeSystemImpl(
+      implicitCasts: false,
       isNonNullableByDefault: false,
       strictCasts: false,
       strictInference: false,

diff --git a/pkg/analyzer/lib/src/dart/element/type_system.dart b/pkg/analyzer/lib/src/dart/element/type_system.dart
@@ -55,6 +55,11 @@ class TypeSystemImpl implements TypeSystem {
   /// The provider of types for the system.
   final TypeProviderImpl typeProvider;
 
+  /// False if implicit casts should always be disallowed.
+  ///
+  /// This affects the behavior of [isAssignableTo].
+  bool implicitCasts;
+
   /// True if "strict casts" should be enforced.
   ///
   /// This affects the behavior of [isAssignableTo].
@@ -84,6 +89,7 @@ class TypeSystemImpl implements TypeSystem {
   late final SubtypeHelper _subtypeHelper;
 
   TypeSystemImpl({
+    required this.implicitCasts,
     required this.isNonNullableByDefault,
     required this.strictCasts,
     required this.strictInference,
@@ -680,9 +686,10 @@ class TypeSystemImpl implements TypeSystem {
       }
     }
 
-    // First make sure that the static analysis option, `strict-casts: true`,
-    // disables all downcasts, including casts from `dynamic`.
-    if (strictCasts) {
+    // First make sure that the static analysis options, `implicit-casts: false`
+    // and `strict-casts: true` disable all downcasts, including casts from
+    // `dynamic`.
+    if (!implicitCasts || strictCasts) {
       return false;
     }
 
@@ -1631,9 +1638,11 @@ class TypeSystemImpl implements TypeSystem {
   }
 
   void updateOptions({
+    required bool implicitCasts,
     required bool strictCasts,
     required bool strictInference,
   }) {
+    this.implicitCasts = implicitCasts;
     this.strictCasts = strictCasts;
     this.strictInference = strictInference;
   }

diff --git a/pkg/analyzer/lib/src/dart/micro/resolve_file.dart b/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
@@ -706,6 +706,7 @@ class FileResolver {
     }
 
     var analysisOptions = AnalysisOptionsImpl()
+      ..implicitCasts = fileAnalysisOptions.implicitCasts
       ..strictInference = fileAnalysisOptions.strictInference;
 
     if (fsState == null) {