[DAS] Removes "Add null check" fix false-positive and fixes num special-casing operators

FMorschel · Commit Queue · commit 990d99161a1a · 2025-08-06T13:42:02.000-07:00
Fixes: #61056 Change-Id: I28dab2908a9a2f384190a4705dd7383aec86860c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/442703 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Auto-Submit: Felipe Morschel <git@fmorschel.dev> Commit-Queue: Brian Wilkerson <brianwilkerson@google.com> Reviewed-by: Samuel Rawlins <srawlins@google.com>
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_null_check.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_null_check.dart
@@ -89,7 +89,7 @@ class AddNullCheck extends ResolvedCorrectionProducer {
       return;
     }
     var fromType = _target.staticType;
-    if (fromType == null) {
+    if (fromType == null || fromType is InvalidType) {
       return;
     }
 
@@ -129,15 +129,11 @@ class AddNullCheck extends ResolvedCorrectionProducer {
     } else if (parent is SpreadElement) {
       var literal = parent.thisOrAncestorOfType<TypedLiteral>();
       if (literal is ListLiteral) {
-        toType = literal.typeOrThrow.asInstanceOf(
-          typeProvider.iterableElement,
-        );
+        toType = literal.typeOrThrow.asInstanceOf(typeProvider.iterableElement);
       } else if (literal is SetOrMapLiteral) {
         toType =
             literal.typeOrThrow.isDartCoreSet
-                ? literal.typeOrThrow.asInstanceOf(
-                  typeProvider.iterableElement,
-                )
+                ? literal.typeOrThrow.asInstanceOf(typeProvider.iterableElement)
                 : literal.typeOrThrow.asInstanceOf(typeProvider.mapElement);
       }
     } else if (parent is YieldStatement) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_extension_member.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_extension_member.dart
@@ -81,6 +81,9 @@ class CreateExtensionGetter extends _CreateExtensionMember {
     // Try to find the type of the field.
     var fieldTypeNode = climbPropertyAccess(nameNode);
     var fieldType = inferUndefinedExpressionType(fieldTypeNode);
+    if (fieldType is InvalidType) {
+      return;
+    }
 
     void writeGetter(DartEditBuilder builder) {
       if (inStaticContext) {
@@ -198,6 +201,9 @@ class CreateExtensionMethod extends _CreateExtensionMember {
     if (invocation ?? parent case Expression exp) {
       returnType = inferUndefinedExpressionType(exp);
     }
+    if (returnType is InvalidType) {
+      return;
+    }
 
     if (returnType is InterfaceType && returnType.isDartCoreFunction) {
       returnType = FunctionTypeImpl(
@@ -363,6 +369,9 @@ class CreateExtensionOperator extends _CreateExtensionMember {
       // Try to find the return type.
       returnType = inferUndefinedExpressionType(node) ?? VoidTypeImpl.instance;
     }
+    if (returnType is InvalidType) {
+      return;
+    }
 
     void writeMethod(DartEditBuilder builder) {
       if (builder.writeType(
@@ -469,6 +478,9 @@ class CreateExtensionSetter extends _CreateExtensionMember {
     // Try to find the type of the field.
     var fieldTypeNode = climbPropertyAccess(nameNode);
     var fieldType = inferUndefinedExpressionType(fieldTypeNode);
+    if (fieldType is InvalidType) {
+      return;
+    }
 
     void writeSetter(DartEditBuilder builder) {
       builder.writeSetterDeclaration(
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_field.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_field.dart
@@ -187,6 +187,9 @@ class CreateField extends CreateFieldOrGetter {
       return;
     }
     var fieldType = inferUndefinedExpressionType(fieldTypeNode);
+    if (fieldType is InvalidType) {
+      return;
+    }
 
     await _addDeclaration(
       builder: builder,
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_function.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_function.dart
@@ -5,6 +5,7 @@
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
@@ -47,14 +48,17 @@ class CreateFunction extends ResolvedCorrectionProducer {
       return;
     }
     insertOffset = enclosingMember.end;
+    var type = inferUndefinedExpressionType(invocation);
+    if (type is InvalidType) {
+      return;
+    }
     // Build method source.
     await builder.addDartFileEdit(file, (builder) {
       var eol = builder.eol;
       var sourcePrefix = '$eol$eol';
       builder.addInsertion(insertOffset, (builder) {
         builder.write(sourcePrefix);
         // append return type
-        var type = inferUndefinedExpressionType(invocation);
         if (builder.writeType(type, groupName: 'RETURN_TYPE')) {
           builder.write(' ');
         }
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_getter.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_getter.dart
@@ -183,6 +183,9 @@ class CreateGetter extends CreateFieldOrGetter {
 
     var fieldTypeNode = climbPropertyAccess(nameNode);
     var fieldType = inferUndefinedExpressionType(fieldTypeNode);
+    if (fieldType is InvalidType) {
+      return;
+    }
 
     await _addDeclaration(
       builder: builder,
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_local_variable.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_local_variable.dart
@@ -68,7 +68,8 @@ class CreateLocalVariable extends ResolvedCorrectionProducer {
     if (!(type == null ||
         type is InterfaceType ||
         type is FunctionType ||
-        type is RecordType)) {
+        type is RecordType ||
+        type is InvalidType)) {
       return;
     }
     // build variable declaration source
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_method.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_method.dart
@@ -7,6 +7,7 @@ import 'package:analysis_server/src/services/correction/util.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
@@ -221,6 +222,11 @@ class CreateMethod extends ResolvedCorrectionProducer {
     if (targetSource == null) return;
 
     var targetFile = targetSource.fullName;
+    var type = inferUndefinedExpressionType(invocation);
+    if (type is InvalidType) {
+      return;
+    }
+
     await builder.addDartFileEdit(targetFile, (builder) {
       if (targetNode == null) return;
       builder.insertMethod(targetNode, (builder) {
@@ -229,7 +235,6 @@ class CreateMethod extends ResolvedCorrectionProducer {
           builder.write('static ');
         }
         // Append return type.
-        var type = inferUndefinedExpressionType(invocation);
         if (builder.writeType(type, groupName: 'RETURN_TYPE')) {
           builder.write(' ');
         }
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_method_or_function.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_method_or_function.dart
@@ -82,6 +82,10 @@ class CreateMethodOrFunction extends ResolvedCorrectionProducer {
       DartType? parameterType;
       var fieldTypeNode = climbPropertyAccess(node);
       parameterType = inferUndefinedExpressionType(fieldTypeNode);
+      if (parameterType is InvalidType) {
+        return;
+      }
+
       var target = getQualifiedPropertyTarget(node);
 
       if (parameterType == null) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_mixin.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_mixin.dart
@@ -8,6 +8,7 @@ import 'package:analysis_server/src/utilities/extensions/string.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
@@ -128,6 +129,9 @@ class _CreateMixin extends ResolvedCorrectionProducer {
     // either not expecting anything specific or expecting a type || object
     if (_expression != null) {
       var fieldType = inferUndefinedExpressionType(_expression);
+      if (fieldType is InvalidType) {
+        return;
+      }
       if (fieldType != null &&
           (!typeSystem.isAssignableTo(fieldType, typeProvider.typeType) ||
               !typeSystem.isSubtypeOf(fieldType, typeProvider.objectType))) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_operator.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_operator.dart
@@ -94,6 +94,9 @@ class CreateOperator extends ResolvedCorrectionProducer {
       // Try to find the return type.
       returnType = inferUndefinedExpressionType(node) ?? VoidTypeImpl.instance;
     }
+    if (returnType is InvalidType) {
+      return;
+    }
 
     var targetClassElement = getTargetInterfaceElement(target);
     if (targetClassElement == null) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_parameter.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_parameter.dart
@@ -6,6 +6,7 @@ import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
+import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
@@ -57,6 +58,9 @@ class CreateParameter extends ResolvedCorrectionProducer {
     // compute type
     var type =
         inferUndefinedExpressionType(nameNode) ?? typeProvider.dynamicType;
+    if (type is InvalidType) {
+      return;
+    }
     var lastRequiredPositional = requiredPositionals.lastOrNull;
     var lastNamed = namedParameters.lastOrNull;
     var hasPreviousParameters =
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_setter.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_setter.dart
@@ -101,10 +101,13 @@ class CreateSetter extends ResolvedCorrectionProducer {
     // Build setter source.
     var targetFile = targetSource.fullName;
     _setterName = nameNode.name;
+    var parameterTypeNode = climbPropertyAccess(nameNode);
+    var parameterType = inferUndefinedExpressionType(parameterTypeNode);
+    if (parameterType is InvalidType) {
+      return;
+    }
     await builder.addDartFileEdit(targetFile, (builder) {
       builder.insertGetter(targetNode, (builder) {
-        var parameterTypeNode = climbPropertyAccess(nameNode);
-        var parameterType = inferUndefinedExpressionType(parameterTypeNode);
         builder.writeSetterDeclaration(
           _setterName,
           isStatic: staticModifier,
diff --git a/pkg/analysis_server/test/src/services/correction/fix/add_null_check_test.dart b/pkg/analysis_server/test/src/services/correction/fix/add_null_check_test.dart
@@ -381,6 +381,21 @@ void f(String x) {
     await assertNoFix();
   }
 
+  Future<void> test_invalidType() async {
+    await resolveTestCode('''
+void g() {
+  int combined = 0;
+  combined += foo();
+}
+''');
+    await assertNoFix(
+      errorFilter:
+          (diagnostic) =>
+              diagnostic.diagnosticCode ==
+              CompileTimeErrorCode.INVALID_ASSIGNMENT,
+    );
+  }
+
   Future<void> test_isNullThen_left_notAssignable_nonNullable() async {
     await resolveTestCode('''
 void f(String s) {}
diff --git a/pkg/analysis_server/test/src/services/correction/fix/create_extension_member_test.dart b/pkg/analysis_server/test/src/services/correction/fix/create_extension_member_test.dart
diff --git a/pkg/analysis_server_plugin/lib/edit/dart/correction_producer.dart b/pkg/analysis_server_plugin/lib/edit/dart/correction_producer.dart

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,9 @@ class CreateField extends CreateFieldOrGetter {`
`187`	`187`	`return;`
`188`	`188`	`}`
`189`	`189`	`var fieldType = inferUndefinedExpressionType(fieldTypeNode);`
	`190`	`+ if (fieldType is InvalidType) {`
	`191`	`+ return;`
	`192`	`+ }`
`190`	`193`
`191`	`194`	`await _addDeclaration(`
`192`	`195`	`builder: builder,`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,9 @@ class CreateOperator extends ResolvedCorrectionProducer {`
`94`	`94`	`// Try to find the return type.`
`95`	`95`	`returnType = inferUndefinedExpressionType(node) ?? VoidTypeImpl.instance;`
`96`	`96`	`}`
	`97`	`+ if (returnType is InvalidType) {`
	`98`	`+ return;`
	`99`	`+ }`
`97`	`100`
`98`	`101`	`var targetClassElement = getTargetInterfaceElement(target);`
`99`	`102`	`if (targetClassElement == null) {`