add fix for ParserErrorCode.PATTERN_ASSIGNMENT_DECLARES_VARIABLE

Fixes: #49960

Change-Id: I3e49203a73739eacff8e05ad2ede25816212a718
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/328403
Commit-Queue: Phil Quitslund <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: pq

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

@@ -0,0 +1,28 @@
+// Copyright (c) 2023, the Dart project authors. Please see the AUTHORS file
+// 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.
+
+import 'package:analysis_server/src/services/correction/dart/abstract_producer.dart';
+import 'package:analysis_server/src/services/correction/fix.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/source/source_range.dart';
+import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
+import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
+
+class RemoveVarKeyword extends ResolvedCorrectionProducer {
+  @override
+  FixKind get fixKind => DartFixKind.REMOVE_VAR_KEYWORD;
+
+  @override
+  Future<void> compute(ChangeBuilder builder) async {
+    var node = coveredNode;
+    if (node is DeclaredVariablePattern) {
+      var keyword = node.keyword;
+      if (keyword != null) {
+        await builder.addDartFileEdit(file, (builder) {
+          builder.addDeletion(SourceRange(keyword.offset, keyword.length + 1));
+        });
+      }
+    }
+  }
+}

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

@@ -3180,7 +3180,7 @@ ParserErrorCode.OUT_OF_ORDER_CLAUSES:
     There isn't enough information for a fix. Consider splitting this diagnostic
     so that each variant has enough information.
 ParserErrorCode.PATTERN_ASSIGNMENT_DECLARES_VARIABLE:
-  status: noFix
+  status: hasFix
 ParserErrorCode.PATTERN_VARIABLE_DECLARATION_OUTSIDE_FUNCTION_OR_METHOD:
   status: noFix
 ParserErrorCode.POSITIONAL_AFTER_NAMED_ARGUMENT:

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

@@ -1513,6 +1513,11 @@ class DartFixKind {
     DartFixKindPriority.DEFAULT,
     "Remove 'var'",
   );
+  static const REMOVE_VAR_KEYWORD = FixKind(
+    'dart.fix.remove.var.keyword',
+    DartFixKindPriority.DEFAULT,
+    "Remove 'var'",
+  );
   static const RENAME_METHOD_PARAMETER = FixKind(
     'dart.fix.rename.methodParameter',
     DartFixKindPriority.DEFAULT,

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

@@ -180,6 +180,7 @@ import 'package:analysis_server/src/services/correction/dart/remove_unused_label
 import 'package:analysis_server/src/services/correction/dart/remove_unused_local_variable.dart';
 import 'package:analysis_server/src/services/correction/dart/remove_unused_parameter.dart';
 import 'package:analysis_server/src/services/correction/dart/remove_var.dart';
+import 'package:analysis_server/src/services/correction/dart/remove_var_keyword.dart';
 import 'package:analysis_server/src/services/correction/dart/rename_method_parameter.dart';
 import 'package:analysis_server/src/services/correction/dart/rename_to_camel_case.dart';
 import 'package:analysis_server/src/services/correction/dart/replace_Null_with_void.dart';
@@ -1504,6 +1505,9 @@ class FixProcessor extends BaseProcessor {
     ParserErrorCode.MIXIN_DECLARES_CONSTRUCTOR: [
       RemoveConstructor.new,
     ],
+    ParserErrorCode.PATTERN_ASSIGNMENT_DECLARES_VARIABLE: [
+      RemoveVarKeyword.new,
+    ],
     ParserErrorCode.RECORD_LITERAL_ONE_POSITIONAL_NO_TRAILING_COMMA: [
       AddTrailingComma.new,
     ],

pkg/analysis_server/test/src/services/correction/fix/remove_var_keyword_test.dart

@@ -0,0 +1,42 @@
+// Copyright (c) 2023, the Dart project authors. Please see the AUTHORS file
+// 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.
+
+import 'package:analysis_server/src/services/correction/fix.dart';
+import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+import 'fix_processor.dart';
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(RemoveVarKeywordTest);
+  });
+}
+
+@reflectiveTest
+class RemoveVarKeywordTest extends FixProcessorTest {
+  @override
+  FixKind get kind => DartFixKind.REMOVE_VAR_KEYWORD;
+
+  Future<void> test_declaredVariablePattern_patternAssignment() async {
+    await resolveTestCode('''
+f() {
+  var a = 1;
+  var b = 2;
+  //ignore: unused_local_variable
+  (var a, b) = (3, 4);
+  print((a, b));
+}
+''');
+    await assertHasFix('''
+f() {
+  var a = 1;
+  var b = 2;
+  //ignore: unused_local_variable
+  (a, b) = (3, 4);
+  print((a, b));
+}
+''');
+  }
+}

pkg/analysis_server/test/src/services/correction/fix/remove_var_test.dart

@@ -33,26 +33,6 @@ void f(int x) {
 ''');
   }
 
-  @FailingTest(
-      issue: 'https://github.com/dart-lang/sdk/issues/49960',
-      reason: 'Fix once error is reported')
-  Future<void> test_declaredVariablePattern_patternAssignment() async {
-    await resolveTestCode('''
-f() {
-  var a = 1;
-  var b = 2;
-  (var a, int b) = (3, 4);
-}
-''');
-    await assertHasFix('''
-f() {
-  var a = 1;
-  var b = 2;
-  (a, int b) = (3, 4);
-}
-''');
-  }
-
   Future<void> test_declaredVariablePattern_patternVariableDeclaration() async {
     await resolveTestCode('''
 f() {

pkg/analysis_server/test/src/services/correction/fix/test_all.dart

@@ -221,6 +221,7 @@ import 'remove_unused_import_test.dart' as remove_unused_import;
 import 'remove_unused_label_test.dart' as remove_unused_label;
 import 'remove_unused_local_variable_test.dart' as remove_unused_local_variable;
 import 'remove_unused_parameter_test.dart' as remove_unused_parameter;
+import 'remove_var_keyword_test.dart' as remove_var_keyword;
 import 'remove_var_test.dart' as remove_var;
 import 'rename_method_parameter_test.dart' as rename_method_parameter;
 import 'rename_to_camel_case_test.dart' as rename_to_camel_case;
@@ -468,6 +469,7 @@ void main() {
     remove_unused_local_variable.main();
     remove_unused_parameter.main();
     remove_var.main();
+    remove_var_keyword.main();
     rename_method_parameter.main();
     rename_to_camel_case.main();
     replace_boolean_with_bool.main();