[cfe] Report error on non-void setter return type

This CL also adds fileUri/charOffset to all TypeBuilder's and renames
Void/FutureOr/Never/Dynamic/BuiltInTypeBuilder to *TypeDeclarationBuilder
so match their relation to TypeBuilder/TypeDeclarationBuilder.

Closes #42962

Change-Id: Iee5102134574d24f748103282a37bb9a85a0ac2d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/161165
Commit-Queue: Johnni Winther <[email protected]>
Reviewed-by: Jens Johansen <[email protected]>

Author: johnniwinther

pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart

@@ -6607,6 +6607,27 @@ Message _withArgumentsNonSimpleBoundViaVariable(String name) {
       arguments: {'name': name});
 }
 
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Null> codeNonVoidReturnOperator = messageNonVoidReturnOperator;
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const MessageCode messageNonVoidReturnOperator = const MessageCode(
+    "NonVoidReturnOperator",
+    analyzerCodes: <String>["NON_VOID_RETURN_FOR_OPERATOR"],
+    message: r"""The return type of the operator []= must be 'void'.""",
+    tip: r"""Try changing the return type to 'void'.""");
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Null> codeNonVoidReturnSetter = messageNonVoidReturnSetter;
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const MessageCode messageNonVoidReturnSetter = const MessageCode(
+    "NonVoidReturnSetter",
+    analyzerCodes: <String>["NON_VOID_RETURN_FOR_SETTER"],
+    message: r"""The return type of the setter must be 'void' or absent.""",
+    tip:
+        r"""Try removing the return type, or define a method rather than a setter.""");
+
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Code<Null> codeNotAConstantExpression = messageNotAConstantExpression;
 

pkg/front_end/lib/src/fasta/builder/builtin_type_builder.dart renamed to pkg/front_end/lib/src/fasta/builder/builtin_type_declaration_builder.dart

@@ -12,10 +12,11 @@ import 'type_builder.dart';
 
 import 'type_declaration_builder.dart';
 
-abstract class BuiltinTypeBuilder extends TypeDeclarationBuilderImpl {
+abstract class BuiltinTypeDeclarationBuilder
+    extends TypeDeclarationBuilderImpl {
   final DartType type;
 
-  BuiltinTypeBuilder(
+  BuiltinTypeDeclarationBuilder(
       String name, this.type, LibraryBuilder compilationUnit, int charOffset)
       : super(null, 0, name, compilationUnit, charOffset);
 
@@ -30,5 +31,5 @@ abstract class BuiltinTypeBuilder extends TypeDeclarationBuilderImpl {
     return type.withDeclaredNullability(nullability);
   }
 
-  String get debugName => "BuiltinTypeBuilder";
+  String get debugName => "BuiltinTypeDeclarationBuilder";
 }

pkg/front_end/lib/src/fasta/builder/class_builder.dart

@@ -84,14 +84,14 @@ import 'library_builder.dart';
 import 'member_builder.dart';
 import 'metadata_builder.dart';
 import 'named_type_builder.dart';
-import 'never_type_builder.dart';
+import 'never_type_declaration_builder.dart';
 import 'nullability_builder.dart';
 import 'procedure_builder.dart';
 import 'type_alias_builder.dart';
 import 'type_builder.dart';
 import 'type_declaration_builder.dart';
 import 'type_variable_builder.dart';
-import 'void_type_builder.dart';
+import 'void_type_declaration_builder.dart';
 
 abstract class ClassBuilder implements DeclarationBuilder {
   /// The type variables declared on a class, extension or mixin declaration.
@@ -687,9 +687,9 @@ abstract class ClassBuilderImpl extends DeclarationBuilderImpl
       }
       // TODO(eernst): Should gather 'restricted supertype' checks in one place,
       // e.g., dynamic/int/String/Null and more are checked elsewhere.
-      if (decl is VoidTypeBuilder) {
+      if (decl is VoidTypeDeclarationBuilder) {
         fail(superClassType, messageExtendsVoid, aliasBuilder);
-      } else if (decl is NeverTypeBuilder) {
+      } else if (decl is NeverTypeDeclarationBuilder) {
         fail(superClassType, messageExtendsNever, aliasBuilder);
       } else if (decl is ClassBuilder) {
         superClass = decl;
@@ -737,9 +737,9 @@ abstract class ClassBuilderImpl extends DeclarationBuilderImpl
         }
         if (decl != superClass) {
           // TODO(eernst): Have all 'restricted supertype' checks in one place.
-          if (decl is VoidTypeBuilder) {
+          if (decl is VoidTypeDeclarationBuilder) {
             fail(type, messageImplementsVoid, aliasBuilder);
-          } else if (decl is NeverTypeBuilder) {
+          } else if (decl is NeverTypeDeclarationBuilder) {
             fail(type, messageImplementsNever, aliasBuilder);
           }
         }

pkg/front_end/lib/src/fasta/builder/dynamic_type_builder.dart renamed to pkg/front_end/lib/src/fasta/builder/dynamic_type_declaration_builder.dart

@@ -6,13 +6,13 @@ library fasta.dynamic_type_builder;
 
 import 'package:kernel/ast.dart' show DartType;
 
-import 'builtin_type_builder.dart';
+import 'builtin_type_declaration_builder.dart';
 import 'library_builder.dart';
 
-class DynamicTypeBuilder extends BuiltinTypeBuilder {
-  DynamicTypeBuilder(
+class DynamicTypeDeclarationBuilder extends BuiltinTypeDeclarationBuilder {
+  DynamicTypeDeclarationBuilder(
       DartType type, LibraryBuilder compilationUnit, int charOffset)
       : super("dynamic", type, compilationUnit, charOffset);
 
-  String get debugName => "DynamicTypeBuilder";
+  String get debugName => "DynamicTypeDeclarationBuilder";
 }

pkg/front_end/lib/src/fasta/builder/enum_builder.dart

@@ -128,19 +128,39 @@ class EnumBuilder extends SourceClassBuilder {
     assert(enumConstantInfos == null || enumConstantInfos.isNotEmpty);
     // TODO(ahe): These types shouldn't be looked up in scope, they come
     // directly from dart:core.
-    TypeBuilder intType =
-        new NamedTypeBuilder("int", const NullabilityBuilder.omitted(), null);
+    TypeBuilder intType = new NamedTypeBuilder(
+        "int",
+        const NullabilityBuilder.omitted(),
+        /* arguments = */ null,
+        /* fileUri = */ null,
+        /* charOffset = */ null);
     TypeBuilder stringType = new NamedTypeBuilder(
-        "String", const NullabilityBuilder.omitted(), null);
+        "String",
+        const NullabilityBuilder.omitted(),
+        /* arguments = */ null,
+        /* fileUri = */ null,
+        /* charOffset = */ null);
     NamedTypeBuilder objectType = new NamedTypeBuilder(
-        "Object", const NullabilityBuilder.omitted(), null);
+        "Object",
+        const NullabilityBuilder.omitted(),
+        /* arguments = */ null,
+        /* fileUri = */ null,
+        /* charOffset = */ null);
     Class cls = new Class(name: name, reference: referencesFrom?.reference);
     Map<String, MemberBuilder> members = <String, MemberBuilder>{};
     Map<String, MemberBuilder> constructors = <String, MemberBuilder>{};
-    NamedTypeBuilder selfType =
-        new NamedTypeBuilder(name, const NullabilityBuilder.omitted(), null);
+    NamedTypeBuilder selfType = new NamedTypeBuilder(
+        name,
+        const NullabilityBuilder.omitted(),
+        /* arguments = */ null,
+        /* fileUri = */ null,
+        /* charOffset = */ null);
     TypeBuilder listType = new NamedTypeBuilder(
-        "List", const NullabilityBuilder.omitted(), <TypeBuilder>[selfType]);
+        "List",
+        const NullabilityBuilder.omitted(),
+        <TypeBuilder>[selfType],
+        /* fileUri = */ null,
+        /* charOffset = */ null);
 
     /// metadata class E {
     ///   final int index;

pkg/front_end/lib/src/fasta/builder/fixed_type_builder.dart

@@ -11,8 +11,10 @@ import 'type_builder.dart';
 
 class FixedTypeBuilder extends TypeBuilder {
   final DartType type;
+  final Uri fileUri;
+  final int charOffset;
 
-  const FixedTypeBuilder(this.type);
+  const FixedTypeBuilder(this.type, this.fileUri, this.charOffset);
 
   TypeBuilder clone(List<TypeBuilder> newTypes) => this;
 
@@ -23,6 +25,8 @@ class FixedTypeBuilder extends TypeBuilder {
 
   String get debugName => 'FixedTypeBuilder';
 
+  bool get isVoidType => type is VoidType;
+
   StringBuffer printOn(StringBuffer buffer) {
     buffer.write('type=${type}');
     return buffer;

pkg/front_end/lib/src/fasta/builder/function_type_builder.dart

@@ -27,16 +27,20 @@ class FunctionTypeBuilder extends TypeBuilder {
   final List<TypeVariableBuilder> typeVariables;
   final List<FormalParameterBuilder> formals;
   final NullabilityBuilder nullabilityBuilder;
+  final Uri fileUri;
+  final int charOffset;
 
   FunctionTypeBuilder(this.returnType, this.typeVariables, this.formals,
-      this.nullabilityBuilder);
+      this.nullabilityBuilder, this.fileUri, this.charOffset);
 
   @override
   String get name => null;
 
   @override
   String get debugName => "Function";
 
+  bool get isVoidType => false;
+
   @override
   StringBuffer printOn(StringBuffer buffer) {
     if (typeVariables != null) {
@@ -143,14 +147,16 @@ class FunctionTypeBuilder extends TypeBuilder {
         returnType?.clone(newTypes),
         clonedTypeVariables,
         clonedFormals,
-        nullabilityBuilder);
+        nullabilityBuilder,
+        fileUri,
+        charOffset);
     newTypes.add(newType);
     return newType;
   }
 
   FunctionTypeBuilder withNullabilityBuilder(
       NullabilityBuilder nullabilityBuilder) {
-    return new FunctionTypeBuilder(
-        returnType, typeVariables, formals, nullabilityBuilder);
+    return new FunctionTypeBuilder(returnType, typeVariables, formals,
+        nullabilityBuilder, fileUri, charOffset);
   }
 }

pkg/front_end/lib/src/fasta/builder/future_or_type_builder.dart renamed to pkg/front_end/lib/src/fasta/builder/future_or_type_declaration_builder.dart

@@ -6,17 +6,17 @@ library fasta.future_or_type_builder;
 
 import 'package:kernel/ast.dart' show DartType, FutureOrType, Nullability;
 
-import 'builtin_type_builder.dart';
+import 'builtin_type_declaration_builder.dart';
 import 'library_builder.dart';
 import 'nullability_builder.dart';
 import 'type_builder.dart';
 
-class FutureOrTypeBuilder extends BuiltinTypeBuilder {
-  FutureOrTypeBuilder(
+class FutureOrTypeDeclarationBuilder extends BuiltinTypeDeclarationBuilder {
+  FutureOrTypeDeclarationBuilder(
       DartType type, LibraryBuilder compilationUnit, int charOffset)
       : super("FutureOr", type, compilationUnit, charOffset);
 
-  String get debugName => "FutureOrTypeBuilder";
+  String get debugName => "FutureOrTypeDeclarationBuilder";
 
   DartType buildType(LibraryBuilder library,
       NullabilityBuilder nullabilityBuilder, List<TypeBuilder> arguments,

pkg/front_end/lib/src/fasta/builder/mixin_application_builder.dart

@@ -16,11 +16,14 @@ import 'type_variable_builder.dart';
 class MixinApplicationBuilder extends TypeBuilder {
   final TypeBuilder supertype;
   final List<TypeBuilder> mixins;
+  final Uri fileUri;
+  final int charOffset;
   Supertype builtType;
 
   List<TypeVariableBuilder> typeVariables;
 
-  MixinApplicationBuilder(this.supertype, this.mixins);
+  MixinApplicationBuilder(
+      this.supertype, this.mixins, this.fileUri, this.charOffset);
 
   String get name => null;
 
@@ -30,6 +33,8 @@ class MixinApplicationBuilder extends TypeBuilder {
 
   String get debugName => "MixinApplicationBuilder";
 
+  bool get isVoidType => false;
+
   StringBuffer printOn(StringBuffer buffer) {
     buffer.write(supertype);
     buffer.write(" with ");

pkg/front_end/lib/src/fasta/builder/named_type_builder.dart

@@ -47,7 +47,7 @@ import '../problems.dart' show unhandled;
 import '../scope.dart';
 
 import 'builder.dart';
-import 'builtin_type_builder.dart';
+import 'builtin_type_declaration_builder.dart';
 import 'class_builder.dart';
 import 'invalid_type_declaration_builder.dart';
 import 'library_builder.dart';
@@ -57,6 +57,7 @@ import 'type_alias_builder.dart';
 import 'type_builder.dart';
 import 'type_declaration_builder.dart';
 import 'type_variable_builder.dart';
+import 'void_type_declaration_builder.dart';
 
 class NamedTypeBuilder extends TypeBuilder {
   final Object name;
@@ -65,20 +66,25 @@ class NamedTypeBuilder extends TypeBuilder {
 
   final NullabilityBuilder nullabilityBuilder;
 
+  @override
   final Uri fileUri;
+
+  @override
   final int charOffset;
 
   @override
   TypeDeclarationBuilder declaration;
 
   NamedTypeBuilder(this.name, this.nullabilityBuilder, this.arguments,
-      [this.fileUri, this.charOffset]);
+      this.fileUri, this.charOffset);
 
   NamedTypeBuilder.fromTypeDeclarationBuilder(
       this.declaration, this.nullabilityBuilder,
       [this.arguments, this.fileUri, this.charOffset])
       : this.name = declaration.name;
 
+  bool get isVoidType => declaration is VoidTypeDeclarationBuilder;
+
   @override
   void bind(TypeDeclarationBuilder declaration) {
     this.declaration = declaration?.origin;
@@ -344,8 +350,8 @@ class NamedTypeBuilder extends TypeBuilder {
         i++;
       }
       if (arguments != null) {
-        NamedTypeBuilder result =
-            new NamedTypeBuilder(name, nullabilityBuilder, arguments);
+        NamedTypeBuilder result = new NamedTypeBuilder(
+            name, nullabilityBuilder, arguments, fileUri, charOffset);
         if (declaration != null) {
           result.bind(declaration);
         } else {
@@ -365,9 +371,9 @@ class NamedTypeBuilder extends TypeBuilder {
         clonedArguments[i] = arguments[i].clone(newTypes);
       }
     }
-    NamedTypeBuilder newType =
-        new NamedTypeBuilder(name, nullabilityBuilder, clonedArguments);
-    if (declaration is BuiltinTypeBuilder) {
+    NamedTypeBuilder newType = new NamedTypeBuilder(
+        name, nullabilityBuilder, clonedArguments, fileUri, charOffset);
+    if (declaration is BuiltinTypeDeclarationBuilder) {
       newType.declaration = declaration;
     } else {
       newTypes.add(newType);
@@ -377,7 +383,8 @@ class NamedTypeBuilder extends TypeBuilder {
 
   NamedTypeBuilder withNullabilityBuilder(
       NullabilityBuilder nullabilityBuilder) {
-    return new NamedTypeBuilder(name, nullabilityBuilder, arguments)
+    return new NamedTypeBuilder(
+        name, nullabilityBuilder, arguments, fileUri, charOffset)
       ..bind(declaration);
   }
 }