Remove deprecated_memberError

[email protected]

Review-Url: https://codereview.chromium.org/2983443003 .

Author: peter-ahe-google

pkg/front_end/lib/src/fasta/kernel/kernel_builder.dart

@@ -40,24 +40,16 @@ export 'kernel_variable_builder.dart' show KernelVariableBuilder;
 
 export 'kernel_invalid_type_builder.dart' show KernelInvalidTypeBuilder;
 
-import 'package:kernel/text/ast_to_text.dart' show Printer;
-
 import 'package:kernel/ast.dart'
     show
-        Class,
         Constructor,
         DartType,
         DynamicType,
-        Field,
         Initializer,
-        Library,
-        Member,
         Procedure,
         RedirectingInitializer,
         TypeParameter;
 
-import '../deprecated_problems.dart' show deprecated_inputError;
-
 import '../builder/builder.dart' show LibraryBuilder;
 
 List<DartType> computeDefaultTypeArguments(LibraryBuilder library,
@@ -79,34 +71,6 @@ List<DartType> computeDefaultTypeArguments(LibraryBuilder library,
   return arguments;
 }
 
-dynamic deprecated_memberError(Member member, Object error, [int charOffset]) {
-  String name = member.name?.name;
-  if (name == "") {
-    name = Printer.emptyNameString;
-  } else if (name == null) {
-    name = "<anon>";
-  }
-  Library library = member.enclosingLibrary;
-  Class cls = member.enclosingClass;
-  String fileUri;
-  if (member is Procedure) {
-    fileUri = member.fileUri;
-  } else if (member is Field) {
-    fileUri = member.fileUri;
-  }
-  fileUri ??= cls?.fileUri ?? library.fileUri;
-  Uri uri = fileUri == null ? library.importUri : Uri.base.resolve(fileUri);
-  charOffset ??= -1;
-  if (charOffset == -1) {
-    charOffset = member.fileOffset ?? -1;
-  }
-  if (charOffset == -1) {
-    charOffset = cls?.fileOffset ?? -1;
-  }
-  name = (cls == null ? "" : "${cls.name}::") + name;
-  return deprecated_inputError(uri, charOffset, "Error in $name: $error");
-}
-
 int compareProcedures(Procedure a, Procedure b) {
   int i = a.fileUri.compareTo(b.fileUri);
   if (i != 0) return i;

pkg/front_end/lib/src/fasta/kernel/kernel_procedure_builder.dart

@@ -47,6 +47,8 @@ import '../messages.dart'
 
 import '../problems.dart' show internalProblem;
 
+import '../deprecated_problems.dart' show deprecated_inputError;
+
 import '../source/source_library_builder.dart' show SourceLibraryBuilder;
 
 import '../type_inference/type_inference_listener.dart'
@@ -66,8 +68,7 @@ import 'kernel_builder.dart'
         MetadataBuilder,
         ProcedureBuilder,
         TypeVariableBuilder,
-        isRedirectingGenerativeConstructorImplementation,
-        deprecated_memberError;
+        isRedirectingGenerativeConstructorImplementation;
 
 import 'kernel_shadow_ast.dart' show KernelProcedure;
 
@@ -357,10 +358,8 @@ class KernelConstructorBuilder extends KernelFunctionBuilder {
 
   void checkSuperOrThisInitializer(Initializer initializer) {
     if (superInitializer != null || redirectingInitializer != null) {
-      deprecated_memberError(
-          target,
-          "Can't have more than one 'super' or 'this' initializer.",
-          initializer.fileOffset);
+      return deprecated_inputError(fileUri, initializer.fileOffset,
+          "Can't have more than one 'super' or 'this' initializer.");
     }
   }
 
@@ -373,16 +372,12 @@ class KernelConstructorBuilder extends KernelFunctionBuilder {
       checkSuperOrThisInitializer(initializer);
       redirectingInitializer = initializer;
       if (constructor.initializers.isNotEmpty) {
-        deprecated_memberError(
-            target,
-            "'this' initializer must be the only initializer.",
-            initializer.fileOffset);
+        deprecated_inputError(fileUri, initializer.fileOffset,
+            "'this' initializer must be the only initializer.");
       }
     } else if (redirectingInitializer != null) {
-      deprecated_memberError(
-          target,
-          "'this' initializer must be the only initializer.",
-          initializer.fileOffset);
+      deprecated_inputError(fileUri, initializer.fileOffset,
+          "'this' initializer must be the only initializer.");
     } else if (superInitializer != null) {
       // If there is a super initializer ([initializer] isn't it), we need to
       // insert [initializer] before the super initializer (thus ensuring that