analyzer: Mark implicit-casts and implicit-dynamic as deprecated

Also add a fix which replaces 'implicit-casts' with 'strict-casts' and
a fix which replaces 'implicit-dynamic' with 'strict-raw-types'.

Fixes #47902

This reverts 5050f31

Change-Id: Icd156b0dda78a50ed28272ddef7460018f511cc2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/276766
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: srawlins

pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml

@@ -43,6 +43,10 @@ AnalysisOptionsErrorCode.PARSE_ERROR:
 AnalysisOptionsHintCode.STRONG_MODE_SETTING_DEPRECATED:
   status: needsFix
   notes: Fixed.
+AnalysisOptionsWarningCode.ANALYSIS_OPTION_DEPRECATED:
+  status: needsEvaluation
+AnalysisOptionsWarningCode.ANALYSIS_OPTION_DEPRECATED_WITH_REPLACEMENT:
+  status: needsEvaluation
 AnalysisOptionsWarningCode.INCLUDE_FILE_NOT_FOUND:
   status: noFix
   notes: |-

pkg/analysis_server/lib/src/services/correction/fix.dart

@@ -40,6 +40,16 @@ class AnalysisOptionsFixKind {
     50,
     "Remove '{0}'",
   );
+  static const REPLACE_WITH_STRICT_CASTS = FixKind(
+    'analysisOptions.fix.replaceWithStrictCasts',
+    50,
+    'Replace with the strict-casts analysis mode',
+  );
+  static const REPLACE_WITH_STRICT_RAW_TYPES = FixKind(
+    'analysisOptions.fix.replaceWithStrictRawTypes',
+    50,
+    'Replace with the strict-raw-types analysis mode',
+  );
 }
 
 /// The implementation of [DartFixContext].

pkg/analysis_server/lib/src/services/correction/fix/analysis_options/fix_generator.dart

@@ -16,9 +16,12 @@ import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/lint/options_rule_validator.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
+import 'package:analyzer_plugin/utilities/change_builder/change_builder_yaml.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_workspace.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
+import 'package:collection/collection.dart';
 import 'package:yaml/yaml.dart';
+import 'package:yaml_edit/yaml_edit.dart';
 
 /// The generator used to generate fixes in analysis options files.
 class AnalysisOptionsFixGenerator {
@@ -64,6 +67,25 @@ class AnalysisOptionsFixGenerator {
 //    } else
     if (errorCode == AnalysisOptionsHintCode.STRONG_MODE_SETTING_DEPRECATED) {
       await _addFix_removeSetting(coveringNodePath);
+    } else if (errorCode ==
+        AnalysisOptionsWarningCode
+            .ANALYSIS_OPTION_DEPRECATED_WITH_REPLACEMENT) {
+      var analyzerMap = options['analyzer'];
+      if (analyzerMap is! YamlMap) {
+        return fixes;
+      }
+      var strongModeMap = analyzerMap['strong-mode'];
+
+      if (strongModeMap is! YamlMap) {
+        return fixes;
+      }
+      if (_isErrorAtMapKey(strongModeMap, 'implicit-casts')) {
+        await _addFix_replaceWithStrictCasts(
+            coveringNodePath, analyzerMap, strongModeMap);
+      } else if (_isErrorAtMapKey(strongModeMap, 'implicit-dynamic')) {
+        await _addFix_replaceWithStrictRawTypes(
+            coveringNodePath, analyzerMap, strongModeMap);
+      }
     } else if (errorCode == DEPRECATED_LINT_HINT) {
       await _addFix_removeLint(coveringNodePath);
 //    } else if (errorCode == AnalysisOptionsWarningCode.INCLUDED_FILE_WARNING) {
@@ -101,6 +123,52 @@ class AnalysisOptionsFixGenerator {
     }
   }
 
+  /// Replaces `analyzer: strong-mode: implicit-casts: false` with
+  /// `analyzer: language: strict-casts: true`.
+  Future<void> _addFix_replaceWithStrictCasts(List<YamlNode> coveringNodePath,
+      YamlMap analyzerMap, YamlMap strongModeMap) async {
+    var builder =
+        ChangeBuilder(workspace: _NonDartChangeWorkspace(resourceProvider));
+    await builder.addYamlFileEdit(file, (builder) {
+      _replaceStrongModeEntryWithLanguageEntry(
+        builder,
+        coveringNodePath,
+        analyzerMap,
+        strongModeMap,
+        strongModeKey: 'implicit-casts',
+        languageKey: 'strict-casts',
+        languageValue: true,
+      );
+    });
+    _addFixFromBuilder(
+        builder, AnalysisOptionsFixKind.REPLACE_WITH_STRICT_CASTS,
+        args: [coveringNodePath[0].toString()]);
+  }
+
+  /// Replaces `analyzer: strong-mode: implicit-dynamic: false` with
+  /// `analyzer: language: strict-raw-types: true`.
+  Future<void> _addFix_replaceWithStrictRawTypes(
+      List<YamlNode> coveringNodePath,
+      YamlMap analyzerMap,
+      YamlMap strongModeMap) async {
+    var builder =
+        ChangeBuilder(workspace: _NonDartChangeWorkspace(resourceProvider));
+    await builder.addYamlFileEdit(file, (builder) {
+      _replaceStrongModeEntryWithLanguageEntry(
+        builder,
+        coveringNodePath,
+        analyzerMap,
+        strongModeMap,
+        strongModeKey: 'implicit-dynamic',
+        languageKey: 'strict-raw-types',
+        languageValue: true,
+      );
+    });
+    _addFixFromBuilder(
+        builder, AnalysisOptionsFixKind.REPLACE_WITH_STRICT_RAW_TYPES,
+        args: [coveringNodePath[0].toString()]);
+  }
+
   /// Add a fix whose edits were built by the [builder] that has the given
   /// [kind]. If [args] are provided, they will be used to fill in the message
   /// for the fix.
@@ -184,6 +252,20 @@ class AnalysisOptionsFixGenerator {
     return offset;
   }
 
+  /// Returns whether the error is located within [map], covering the
+  /// [YamlScalar] node for [key].
+  bool _isErrorAtMapKey(YamlMap map, String key) {
+    var keyNode = map.nodes.keys
+        .whereType<YamlScalar>()
+        .firstWhereOrNull((k) => k.value == key);
+    if (keyNode == null) {
+      return false;
+    }
+    var keyOffset = keyNode.span.start.offset;
+    var keyLength = keyNode.span.end.offset - keyOffset;
+    return keyOffset == errorOffset && keyLength == errorLength;
+  }
+
   SourceRange _lines(int start, int end) {
     var startLocation = lineInfo.getLocation(start);
     var startOffset = lineInfo.getOffsetOfLine(startLocation.lineNumber - 1);
@@ -192,6 +274,53 @@ class AnalysisOptionsFixGenerator {
         math.min(endLocation.lineNumber, lineInfo.lineCount - 1));
     return SourceRange(startOffset, endOffset - startOffset);
   }
+
+  /// Replaces a 'strong-mode' entry keyed to [strongModeKey] with a 'language'
+  /// entry with [languageKey] and [languageValue].
+  ///
+  /// 'strong-mode' and 'language' are each maps which can be found under the
+  /// top-level 'analyzer' map. 'strong-mode' (given as [strongModeMap]) must
+  /// already be present under the 'analyzer' map (given as [analyzerMap]).
+  void _replaceStrongModeEntryWithLanguageEntry(
+    YamlFileEditBuilder builder,
+    List<YamlNode> coveringNodePath,
+    YamlMap analyzerMap,
+    YamlMap strongModeMap, {
+    required String strongModeKey,
+    required String languageKey,
+    required Object? languageValue,
+  }) {
+    var yamlEditor = YamlEditor(content);
+    // If 'language' does not exist yet under 'analyzer', create it.
+    if (analyzerMap['language'] == null) {
+      yamlEditor.update(['analyzer', 'language'], {languageKey: languageValue});
+    } else {
+      yamlEditor.update(['analyzer', 'language', languageKey], languageValue);
+    }
+    var languageEdit = yamlEditor.edits.single;
+    builder.addSimpleReplacement(
+        SourceRange(languageEdit.offset, languageEdit.length),
+        languageEdit.replacement);
+
+    // If `strongModeKey` is the only entry under 'strong-mode', then remove
+    // the entire 'strong-mode' entry.
+    if (strongModeMap.length == 1) {
+      yamlEditor.remove(['analyzer', 'strong-mode']);
+    } else {
+      yamlEditor.remove(['analyzer', 'strong-mode', strongModeKey]);
+    }
+    var strongModeEdit = yamlEditor.edits[1];
+    int strongModeEditOffset;
+    if (strongModeEdit.offset > languageEdit.offset) {
+      strongModeEditOffset = strongModeEdit.offset -
+          (languageEdit.replacement.length - languageEdit.length);
+    } else {
+      strongModeEditOffset = strongModeEdit.offset;
+    }
+    builder.addSimpleReplacement(
+        SourceRange(strongModeEditOffset, strongModeEdit.length),
+        strongModeEdit.replacement);
+  }
 }
 
 class _NonDartChangeWorkspace implements ChangeWorkspace {

pkg/analysis_server/pubspec.yaml

@@ -24,6 +24,7 @@ dependencies:
   test: any
   watcher: any
   yaml: any
+  yaml_edit: any
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dev_dependencies:

pkg/analysis_server/test/abstract_context.dart

@@ -65,6 +65,10 @@ class AbstractContextTest with ResourceProviderMixin {
 
   Future<AnalysisSession> get session => sessionFor(testPackageRootPath);
 
+  /// The path for `analysis_options.yaml` in [testPackageRootPath].
+  String get testAnalysisOptionsPath =>
+      convertPath('$testPackageRootPath/analysis_options.yaml');
+
   String? get testPackageLanguageVersion => latestLanguageVersion;
 
   String get testPackageLibPath => '$testPackageRootPath/lib';

pkg/analysis_server/test/analysis_server_base.dart

@@ -58,9 +58,15 @@ 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');
+    if (!implicitCasts || !implicitDynamic) {
+      buffer.writeln('  strong-mode:');
+      if (!implicitCasts) {
+        buffer.writeln('    implicit-casts: $implicitCasts');
+      }
+      if (!implicitDynamic) {
+        buffer.writeln('    implicit-dynamic: $implicitDynamic');
+      }
+    }
 
     buffer.writeln('linter:');
     buffer.writeln('  rules:');

pkg/analysis_server/test/client/completion_driver_test.dart

@@ -271,7 +271,7 @@ class BasicCompletionTest2 extends AbstractCompletionDriverTest
 }
 
 mixin BasicCompletionTestCases on AbstractCompletionDriverTest {
-  /// Duplicates (and potentially replaces DeprecatedMemberRelevanceTest).
+  /// Duplicates (and potentially replaces) [DeprecatedMemberRelevanceTest].
   Future<void> test_deprecated_member_relevance() async {
     await addTestFile('''
 class A {