Wire up remove var and replace if else with conditional for patterns

BUG=#49960

Change-Id: I1a2d6e69127d4d82ed2cd4a121572d0ff6c3af82
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/280200
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Keerti Parthasarathy <[email protected]>

Author: keertip

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

@@ -22,6 +22,9 @@ class ReplaceIfElseWithConditional extends CorrectionProducer {
       return;
     }
     var ifStatement = node as IfStatement;
+    if (ifStatement.caseClause != null) {
+      return;
+    }
     // single then/else statements
     var thenStatement = getSingleStatement(ifStatement.thenStatement);
     var elseStatement = getSingleStatement(ifStatement.elseStatement);

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

@@ -1193,7 +1193,7 @@ CompileTimeErrorCode.VALUES_DECLARATION_IN_ENUM:
     to think about what they were trying to do and it seems more likely that the
     right fix is to rename the member.
 CompileTimeErrorCode.VARIABLE_PATTERN_KEYWORD_IN_DECLARATION_CONTEXT:
-  status: needsEvaluation
+  status: hasFix
 CompileTimeErrorCode.VARIABLE_TYPE_MISMATCH:
   status: needsEvaluation
 CompileTimeErrorCode.WRONG_EXPLICIT_TYPE_PARAMETER_VARIANCE_IN_SUPERINTERFACE:

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

@@ -961,6 +961,9 @@ class FixProcessor extends BaseProcessor {
     CompileTimeErrorCode.CONST_WITH_NON_TYPE: [
       ChangeTo.classOrMixin,
     ],
+    CompileTimeErrorCode.CONSTANT_PATTERN_WITH_NON_CONSTANT_EXPRESSION: [
+      AddConst.new,
+    ],
     CompileTimeErrorCode.DEFAULT_VALUE_ON_REQUIRED_PARAMETER: [
       RemoveDefaultValue.new,
       RemoveRequired.new,
@@ -1299,16 +1302,16 @@ class FixProcessor extends BaseProcessor {
     CompileTimeErrorCode.URI_DOES_NOT_EXIST: [
       CreateFile.new,
     ],
+    CompileTimeErrorCode.VARIABLE_PATTERN_KEYWORD_IN_DECLARATION_CONTEXT: [
+      RemoveVar.new,
+    ],
     CompileTimeErrorCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS_CONSTRUCTOR: [
       MoveTypeArgumentsToClass.new,
       RemoveTypeArguments.new,
     ],
     CompileTimeErrorCode.YIELD_OF_INVALID_TYPE: [
       MakeReturnTypeNullable.new,
     ],
-    CompileTimeErrorCode.CONSTANT_PATTERN_WITH_NON_CONSTANT_EXPRESSION: [
-      AddConst.new,
-    ],
     FfiCode.SUBTYPE_OF_FFI_CLASS_IN_EXTENDS: [
       RemoveNameFromDeclarationClause.new,
     ],

pkg/analysis_server/test/src/services/correction/assist/replace_if_else_with_conditional_test.dart

@@ -51,6 +51,21 @@ void f() {
     await assertNoAssistAt('else');
   }
 
+  Future<void> test_ifCasePattern() async {
+    await resolveTestCode('''
+f() {
+  var json = [1, 2, 3];
+  int vvv;
+  if (json case [3, 4]) {
+    vvv = 111;
+  } else {
+    vvv = 222;
+  }
+}
+''');
+    await assertNoAssistAt('if (json case [3, 4])');
+  }
+
   Future<void> test_notIfStatement() async {
     await resolveTestCode('''
 void f() {

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

@@ -29,6 +29,41 @@ f() {}
 ''');
   }
 
+  Future<void> test_pattern_declaration() async {
+    await resolveTestCode('''
+f() {
+  var [var x] = [1];
+  print(x);
+}
+''');
+    await assertHasFix('''
+f() {
+  var [x] = [1];
+  print(x);
+}
+''');
+  }
+
+  @FailingTest(
+      issue: "https://github.com/dart-lang/sdk/issues/49960",
+      reason: "Fix once error is reported")
+  Future<void> test_pattern_in_assignment() 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_setter() async {
     await resolveTestCode('''
 class C {