diagnostic ref fix for fall-through types

See: #38633

Change-Id: I5fd1328a5ad234e6216631007ecbcc459bfa36e9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/120340
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Phil Quitslund <pquitslund@google.com>

Author: pq

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

@@ -100,10 +100,9 @@ abstract class BaseProcessor {
     }
 
     var constructorName;
-    var hasTypeArgs = false;
-    if (type.isDartCoreBool) {
-      constructorName = 'DiagnosticsProperty<bool>';
-    } else if (type.isDartCoreInt) {
+    var typeArgs;
+
+    if (type.isDartCoreInt) {
       constructorName = 'IntProperty';
     } else if (type.isDartCoreDouble) {
       constructorName = 'DoubleProperty';
@@ -113,15 +112,16 @@ abstract class BaseProcessor {
       constructorName = 'EnumProperty';
     } else if (isIterable(type)) {
       constructorName = 'IterableProperty';
-      hasTypeArgs = true;
+      typeArgs = (type as InterfaceType).typeArguments;
     } else if (flutter.isColor(type)) {
       constructorName = 'ColorProperty';
     } else if (flutter.isMatrix4(type)) {
       constructorName = 'TransformProperty';
-    }
-
-    if (constructorName == null) {
-      return null;
+    } else {
+      constructorName = 'DiagnosticsProperty';
+      if (!type.isDynamic) {
+        typeArgs = [type];
+      }
     }
 
     void writePropertyReference(
@@ -130,9 +130,9 @@ abstract class BaseProcessor {
       @required String builderName,
     }) {
       builder.write("$prefix$builderName.add($constructorName");
-      if (hasTypeArgs) {
+      if (typeArgs != null) {
         builder.write('<');
-        builder.writeTypes((type as InterfaceType).typeArguments);
+        builder.writeTypes(typeArgs);
         builder.write('>');
       }
       builder.writeln("('${name.name}', ${name.name}));");

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

@@ -162,6 +162,28 @@ class A extends Widget {
 ''');
   }
 
+  test_dynamicField_debugFillProperties() async {
+    await resolveTestUnit('''
+class A extends Widget {
+  dynamic /*LINT*/field;
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+  }
+}
+''');
+    await assertHasFix('''
+class A extends Widget {
+  dynamic /*LINT*/field;
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+    properties.add(DiagnosticsProperty('field', field));
+  }
+}
+''');
+  }
+
   test_enumField_debugFillProperties() async {
     await resolveTestUnit('''
 enum foo {bar}
@@ -277,6 +299,28 @@ class A extends Widget {
 ''');
   }
 
+  test_objectField_debugFillProperties() async {
+    await resolveTestUnit('''
+class A extends Widget {
+  Object /*LINT*/field;
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+  }
+}
+''');
+    await assertHasFix('''
+class A extends Widget {
+  Object /*LINT*/field;
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+    properties.add(DiagnosticsProperty<Object>('field', field));
+  }
+}
+''');
+  }
+
   test_stringField_debugFillProperties() async {
     await resolveTestUnit('''
 class A extends Widget {