Bump to analyzer 6.1.0 (#4648)

Author: srawlins

lib/src/rules/avoid_return_types_on_setters.dart

@@ -27,6 +27,7 @@ set speed(int ms);
 ''';
 
 class AvoidReturnTypesOnSetters extends LintRule {
+  @override
   bool get canUseParsedResult => true;
 
   static const LintCode code = LintCode(

lib/src/rules/curly_braces_in_flow_control_structures.dart

@@ -51,6 +51,7 @@ if (overflowChars != other.overflowChars) {
 ''';
 
 class CurlyBracesInFlowControlStructures extends LintRule {
+  @override
   bool get canUseParsedResult => true;
 
   static const LintCode code = LintCode(

lib/src/rules/prefer_generic_function_type_aliases.dart

@@ -33,6 +33,7 @@ typedef F = void Function();
 ''';
 
 class PreferGenericFunctionTypeAliases extends LintRule {
+  @override
   bool get canUseParsedResult => true;
 
   static const LintCode code = LintCode('prefer_generic_function_type_aliases',

lib/src/rules/slash_for_doc_comments.dart

@@ -43,6 +43,7 @@ bool isJavaStyle(Comment comment) {
 }
 
 class SlashForDocComments extends LintRule {
+  @override
   bool get canUseParsedResult => true;
 
   static const LintCode code = LintCode('slash_for_doc_comments',

lib/src/rules/test_types_in_equals.dart

@@ -113,11 +113,11 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   String _getTypeName(MethodDeclaration method) {
     var parent = method.parent;
-    if (parent is ClassOrAugmentationDeclaration) {
+    if (parent is ClassDeclaration) {
       return parent.name.lexeme;
     } else if (parent is EnumDeclaration) {
       return parent.name.lexeme;
-    } else if (parent is MixinOrAugmentationDeclaration) {
+    } else if (parent is MixinDeclaration) {
       return parent.name.lexeme;
     } else if (parent is ExtensionDeclaration) {
       return parent.extendedType.toSource();

lib/src/rules/unnecessary_const.dart

@@ -34,6 +34,7 @@ m(){
 ''';
 
 class UnnecessaryConst extends LintRule {
+  @override
   bool get canUseParsedResult => true;
 
   static const LintCode code = LintCode(

lib/src/rules/unnecessary_new.dart

@@ -32,6 +32,7 @@ m(){
 ''';
 
 class UnnecessaryNew extends LintRule {
+  @override
   bool get canUseParsedResult => true;
 
   static const LintCode code = LintCode(

lib/src/rules/unnecessary_string_escapes.dart

@@ -28,6 +28,7 @@ Remove unnecessary backslashes in strings.
 ''';
 
 class UnnecessaryStringEscapes extends LintRule {
+  @override
   bool get canUseParsedResult => true;
 
   static const LintCode code = LintCode(

lib/src/rules/use_function_type_syntax_for_parameters.dart

@@ -25,6 +25,7 @@ Iterable<T> where(bool Function(T) predicate) {}
 ''';
 
 class UseFunctionTypeSyntaxForParameters extends LintRule {
+  @override
   bool get canUseParsedResult => true;
 
   static const LintCode code = LintCode(

pubspec.yaml

@@ -10,7 +10,7 @@ environment:
   sdk: ^3.0.0
 
 dependencies:
-  analyzer: ^6.0.0
+  analyzer: ^6.1.0
   args: ^2.1.0
   collection: ^1.15.0
   http: ">=0.13.0 <2.0.0"

test/rule_test.dart

@@ -9,10 +9,10 @@ import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
+import 'package:analyzer/src/analysis_options/apply_options.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/lint/io.dart';
 import 'package:analyzer/src/lint/registry.dart';
-import 'package:analyzer/src/task/options.dart';
 import 'package:analyzer/src/utilities/legacy.dart';
 import 'package:linter/src/analyzer.dart';
 import 'package:linter/src/ast.dart';
@@ -300,7 +300,7 @@ void _validateExpectedLints(File file, Iterable<AnalysisErrorInfo> errorInfos,
       var optionsProvider = AnalysisOptionsProvider();
       var optionMap = optionsProvider.getOptionsFromString(analysisOptions);
       var optionsImpl = AnalysisOptionsImpl();
-      applyToAnalysisOptions(optionsImpl, optionMap);
+      optionsImpl.applyOptions(optionMap);
 
       var features = optionsImpl.contextFeatures;
 

test/rules/prefer_const_constructors_test.dart

@@ -20,7 +20,6 @@ class PreferConstConstructorsTest extends LintRuleTest {
   @override
   String get lintRule => 'prefer_const_constructors';
 
-  @FailingTest(issue: 'https://github.com/dart-lang/linter/issues/3389')
   test_deferred_arg() async {
     newFile2('$testPackageLibPath/a.dart', '''
 class A {