Get rid of double colons in override error messages.
Change-Id: Ice49347ab20fcf02971abe724b7233ca5fdf03e5
Reviewed-on: https://dart-review.googlesource.com/c/85582
Commit-Queue: Aske Simon Christensen <askesc@google.com>
Reviewed-by: Dmitry Stefantsov <dmitryas@google.com>
diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_class_builder.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_class_builder.dart
index 0c866f4..ad101b7 100644
--- a/pkg/front_end/lib/src/fasta/kernel/kernel_class_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/kernel_class_builder.dart
@@ -944,9 +944,9 @@
interfaceFunction?.typeParameters?.length) {
library.addProblem(
templateOverrideTypeVariablesMismatch.withArguments(
- "${declaredMember.enclosingClass.name}::"
+ "${declaredMember.enclosingClass.name}."
"${declaredMember.name.name}",
- "${interfaceMember.enclosingClass.name}::"
+ "${interfaceMember.enclosingClass.name}."
"${interfaceMember.name.name}"),
declaredMember.fileOffset,
noLength,
@@ -981,9 +981,9 @@
if (declaredBound != substitution.substituteType(interfaceBound)) {
library.addProblem(
templateOverrideTypeVariablesMismatch.withArguments(
- "${declaredMember.enclosingClass.name}::"
+ "${declaredMember.enclosingClass.name}."
"${declaredMember.name.name}",
- "${interfaceMember.enclosingClass.name}::"
+ "${interfaceMember.enclosingClass.name}."
"${interfaceMember.name.name}"),
declaredMember.fileOffset,
noLength,
@@ -1115,9 +1115,9 @@
interfaceFunction.positionalParameters.length) {
library.addProblem(
templateOverrideFewerPositionalArguments.withArguments(
- "${declaredMember.enclosingClass.name}::"
+ "${declaredMember.enclosingClass.name}."
"${declaredMember.name.name}",
- "${interfaceMember.enclosingClass.name}::"
+ "${interfaceMember.enclosingClass.name}."
"${interfaceMember.name.name}"),
declaredMember.fileOffset,
noLength,
@@ -1134,9 +1134,9 @@
declaredFunction.requiredParameterCount) {
library.addProblem(
templateOverrideMoreRequiredArguments.withArguments(
- "${declaredMember.enclosingClass.name}::"
+ "${declaredMember.enclosingClass.name}."
"${declaredMember.name.name}",
- "${interfaceMember.enclosingClass.name}::"
+ "${interfaceMember.enclosingClass.name}."
"${interfaceMember.name.name}"),
declaredMember.fileOffset,
noLength,
@@ -1176,9 +1176,9 @@
interfaceFunction.namedParameters.length) {
library.addProblem(
templateOverrideFewerNamedArguments.withArguments(
- "${declaredMember.enclosingClass.name}::"
+ "${declaredMember.enclosingClass.name}."
"${declaredMember.name.name}",
- "${interfaceMember.enclosingClass.name}::"
+ "${interfaceMember.enclosingClass.name}."
"${interfaceMember.name.name}"),
declaredMember.fileOffset,
noLength,
@@ -1213,10 +1213,10 @@
if (!declaredNamedParameters.moveNext()) {
library.addProblem(
templateOverrideMismatchNamedParameter.withArguments(
- "${declaredMember.enclosingClass.name}::"
+ "${declaredMember.enclosingClass.name}."
"${declaredMember.name.name}",
interfaceNamedParameters.current.name,
- "${interfaceMember.enclosingClass.name}::"
+ "${interfaceMember.enclosingClass.name}."
"${interfaceMember.name.name}"),
declaredMember.fileOffset,
noLength,
diff --git a/pkg/front_end/testcases/inference/generic_methods_do_not_infer_invalid_override_of_generic_method.dart.strong.expect b/pkg/front_end/testcases/inference/generic_methods_do_not_infer_invalid_override_of_generic_method.dart.strong.expect
index eb9c06b..a4f9811 100644
--- a/pkg/front_end/testcases/inference/generic_methods_do_not_infer_invalid_override_of_generic_method.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_do_not_infer_invalid_override_of_generic_method.dart.strong.expect
@@ -1,6 +1,6 @@
// Formatted problems:
//
-// pkg/front_end/testcases/inference/generic_methods_do_not_infer_invalid_override_of_generic_method.dart:14:64: Error: Declared type variables of 'D::m' doesn't match those on overridden method 'C::m'.
+// pkg/front_end/testcases/inference/generic_methods_do_not_infer_invalid_override_of_generic_method.dart:14:64: Error: Declared type variables of 'D.m' doesn't match those on overridden method 'C.m'.
// /*@error=OverrideTypeMismatchReturnType*/ /*@topType=dynamic*/ m(
// ^
// pkg/front_end/testcases/inference/generic_methods_do_not_infer_invalid_override_of_generic_method.dart:9:5: Context: This is the overridden method ('m').
@@ -21,7 +21,7 @@
// Unhandled errors:
//
-// pkg/front_end/testcases/inference/generic_methods_do_not_infer_invalid_override_of_generic_method.dart:14:64: Error: Declared type variables of 'D::m' doesn't match those on overridden method 'C::m'.
+// pkg/front_end/testcases/inference/generic_methods_do_not_infer_invalid_override_of_generic_method.dart:14:64: Error: Declared type variables of 'D.m' doesn't match those on overridden method 'C.m'.
// /*@error=OverrideTypeMismatchReturnType*/ /*@topType=dynamic*/ m(
// ^
//
diff --git a/pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart.legacy.expect b/pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart.legacy.expect
index d819cdc..44e5758 100644
--- a/pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart.legacy.expect
@@ -1,13 +1,13 @@
// Formatted problems:
//
-// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:14:46: Warning: Declared type variables of 'D::m' doesn't match those on overridden method 'C::m'.
+// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:14:46: Warning: Declared type variables of 'D.m' doesn't match those on overridden method 'C.m'.
// T /*@error=OverrideTypeVariablesMismatch*/ m<T>(
// ^
// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:9:24: Context: This is the overridden method ('m').
// /*@topType=dynamic*/ m(/*@topType=dynamic*/ x) => x;
// ^
//
-// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:17:46: Warning: Declared type variables of 'D::g' doesn't match those on overridden method 'C::g'.
+// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:17:46: Warning: Declared type variables of 'D.g' doesn't match those on overridden method 'C.g'.
// T /*@error=OverrideTypeVariablesMismatch*/ g<T>(
// ^
// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:10:11: Context: This is the overridden method ('g').
diff --git a/pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart.strong.expect b/pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart.strong.expect
index 72a0420..7df8c64 100644
--- a/pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart.strong.expect
@@ -1,6 +1,6 @@
// Formatted problems:
//
-// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:14:46: Error: Declared type variables of 'D::m' doesn't match those on overridden method 'C::m'.
+// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:14:46: Error: Declared type variables of 'D.m' doesn't match those on overridden method 'C.m'.
// T /*@error=OverrideTypeVariablesMismatch*/ m<T>(
// ^
// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:9:24: Context: This is the overridden method ('m').
@@ -15,7 +15,7 @@
// /*@topType=dynamic*/ m(/*@topType=dynamic*/ x) => x;
// ^
//
-// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:17:46: Error: Declared type variables of 'D::g' doesn't match those on overridden method 'C::g'.
+// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:17:46: Error: Declared type variables of 'D.g' doesn't match those on overridden method 'C.g'.
// T /*@error=OverrideTypeVariablesMismatch*/ g<T>(
// ^
// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:10:11: Context: This is the overridden method ('g').
@@ -32,7 +32,7 @@
// Unhandled errors:
//
-// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:14:46: Error: Declared type variables of 'D::m' doesn't match those on overridden method 'C::m'.
+// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:14:46: Error: Declared type variables of 'D.m' doesn't match those on overridden method 'C.m'.
// T /*@error=OverrideTypeVariablesMismatch*/ m<T>(
// ^
//
@@ -41,7 +41,7 @@
// T /*@error=OverrideTypeMismatchParameter*/ x) =>
// ^
//
-// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:17:46: Error: Declared type variables of 'D::g' doesn't match those on overridden method 'C::g'.
+// pkg/front_end/testcases/inference/generic_methods_handle_override_of_non_generic_with_generic.dart:17:46: Error: Declared type variables of 'D.g' doesn't match those on overridden method 'C.g'.
// T /*@error=OverrideTypeVariablesMismatch*/ g<T>(
// ^
//
diff --git a/pkg/front_end/testcases/inference/infer_method_missing_params.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_method_missing_params.dart.legacy.expect
index eb809e8..8d85497 100644
--- a/pkg/front_end/testcases/inference/infer_method_missing_params.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_method_missing_params.dart.legacy.expect
@@ -1,6 +1,6 @@
// Formatted problems:
//
-// pkg/front_end/testcases/inference/infer_method_missing_params.dart:23:61: Warning: The method 'C::f' has more required arguments than those of overridden method 'B::f'.
+// pkg/front_end/testcases/inference/infer_method_missing_params.dart:23:61: Warning: The method 'C.f' has more required arguments than those of overridden method 'B.f'.
// /*@topType=int*/ /*@error=OverrideMoreRequiredArguments*/ f(
// ^
// pkg/front_end/testcases/inference/infer_method_missing_params.dart:17:7: Context: This is the overridden method ('f').
diff --git a/pkg/front_end/testcases/inference/infer_method_missing_params.dart.outline.expect b/pkg/front_end/testcases/inference/infer_method_missing_params.dart.outline.expect
index 68ab1aa..4768ea2 100644
--- a/pkg/front_end/testcases/inference/infer_method_missing_params.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/infer_method_missing_params.dart.outline.expect
@@ -1,6 +1,6 @@
// Formatted problems:
//
-// pkg/front_end/testcases/inference/infer_method_missing_params.dart:23:61: Warning: The method 'C::f' has more required arguments than those of overridden method 'B::f'.
+// pkg/front_end/testcases/inference/infer_method_missing_params.dart:23:61: Warning: The method 'C.f' has more required arguments than those of overridden method 'B.f'.
// /*@topType=int*/ /*@error=OverrideMoreRequiredArguments*/ f(
// ^
// pkg/front_end/testcases/inference/infer_method_missing_params.dart:17:7: Context: This is the overridden method ('f').
diff --git a/pkg/front_end/testcases/inference/infer_method_missing_params.dart.strong.expect b/pkg/front_end/testcases/inference/infer_method_missing_params.dart.strong.expect
index 27e8464..24fae77 100644
--- a/pkg/front_end/testcases/inference/infer_method_missing_params.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_method_missing_params.dart.strong.expect
@@ -15,7 +15,7 @@
// [/*@topType=dynamic*/ /*@error=CantInferTypeDueToInconsistentOverrides*/ y]);
// ^
//
-// pkg/front_end/testcases/inference/infer_method_missing_params.dart:23:61: Error: The method 'C::f' has more required arguments than those of overridden method 'B::f'.
+// pkg/front_end/testcases/inference/infer_method_missing_params.dart:23:61: Error: The method 'C.f' has more required arguments than those of overridden method 'B.f'.
// /*@topType=int*/ /*@error=OverrideMoreRequiredArguments*/ f(
// ^
// pkg/front_end/testcases/inference/infer_method_missing_params.dart:17:7: Context: This is the overridden method ('f').
@@ -39,7 +39,7 @@
// [/*@topType=dynamic*/ /*@error=CantInferTypeDueToInconsistentOverrides*/ y]);
// ^
//
-// pkg/front_end/testcases/inference/infer_method_missing_params.dart:23:61: Error: The method 'C::f' has more required arguments than those of overridden method 'B::f'.
+// pkg/front_end/testcases/inference/infer_method_missing_params.dart:23:61: Error: The method 'C.f' has more required arguments than those of overridden method 'B.f'.
// /*@topType=int*/ /*@error=OverrideMoreRequiredArguments*/ f(
// ^
diff --git a/pkg/front_end/testcases/mixin_application_override.dart.legacy.expect b/pkg/front_end/testcases/mixin_application_override.dart.legacy.expect
index d2606bc..142551c 100644
--- a/pkg/front_end/testcases/mixin_application_override.dart.legacy.expect
+++ b/pkg/front_end/testcases/mixin_application_override.dart.legacy.expect
@@ -1,6 +1,6 @@
// Formatted problems:
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -10,7 +10,7 @@
// class A0 = S with M;
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -20,7 +20,7 @@
// class A1 = S with M1, M;
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -30,7 +30,7 @@
// class A2 = S with M1, M2, M;
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -40,7 +40,7 @@
// class A0X = S with M, MX;
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -50,7 +50,7 @@
// class A1X = S with M1, M, MX;
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -60,7 +60,7 @@
// class A2X = S with M1, M2, M, MX;
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -70,7 +70,7 @@
// class B0 extends S with M {}
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -80,7 +80,7 @@
// class B1 extends S with M1, M {}
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -90,7 +90,7 @@
// class B2 extends S with M1, M2, M {}
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -100,7 +100,7 @@
// class B0X extends S with M, MX {}
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -110,7 +110,7 @@
// class B1X extends S with M1, M, MX {}
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
diff --git a/pkg/front_end/testcases/mixin_application_override.dart.outline.expect b/pkg/front_end/testcases/mixin_application_override.dart.outline.expect
index c54cc03..7d607e6 100644
--- a/pkg/front_end/testcases/mixin_application_override.dart.outline.expect
+++ b/pkg/front_end/testcases/mixin_application_override.dart.outline.expect
@@ -1,6 +1,6 @@
// Formatted problems:
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -10,7 +10,7 @@
// class A0 = S with M;
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -20,7 +20,7 @@
// class A1 = S with M1, M;
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -30,7 +30,7 @@
// class A2 = S with M1, M2, M;
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -40,7 +40,7 @@
// class A0X = S with M, MX;
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -50,7 +50,7 @@
// class A1X = S with M1, M, MX;
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -60,7 +60,7 @@
// class A2X = S with M1, M2, M, MX;
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -70,7 +70,7 @@
// class B0 extends S with M {}
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -80,7 +80,7 @@
// class B1 extends S with M1, M {}
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -90,7 +90,7 @@
// class B2 extends S with M1, M2, M {}
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -100,7 +100,7 @@
// class B0X extends S with M, MX {}
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -110,7 +110,7 @@
// class B1X extends S with M1, M, MX {}
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Warning: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
diff --git a/pkg/front_end/testcases/mixin_application_override.dart.strong.expect b/pkg/front_end/testcases/mixin_application_override.dart.strong.expect
index 2a70a41..a25b92f 100644
--- a/pkg/front_end/testcases/mixin_application_override.dart.strong.expect
+++ b/pkg/front_end/testcases/mixin_application_override.dart.strong.expect
@@ -1,6 +1,6 @@
// Formatted problems:
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -10,7 +10,7 @@
// class A0 = S with M;
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -20,7 +20,7 @@
// class A1 = S with M1, M;
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -30,7 +30,7 @@
// class A2 = S with M1, M2, M;
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -40,7 +40,7 @@
// class A0X = S with M, MX;
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -50,7 +50,7 @@
// class A1X = S with M1, M, MX;
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -60,7 +60,7 @@
// class A2X = S with M1, M2, M, MX;
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -70,7 +70,7 @@
// class B0 extends S with M {}
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -80,7 +80,7 @@
// class B1 extends S with M1, M {}
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -90,7 +90,7 @@
// class B2 extends S with M1, M2, M {}
// ^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -100,7 +100,7 @@
// class B0X extends S with M, MX {}
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -110,7 +110,7 @@
// class B1X extends S with M1, M, MX {}
// ^^^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
// pkg/front_end/testcases/mixin_application_override.dart:8:3: Context: This is the overridden method ('foo').
@@ -122,51 +122,51 @@
// Unhandled errors:
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
//
-// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M::foo' has fewer positional arguments than those of overridden method 'S::foo'.
+// pkg/front_end/testcases/mixin_application_override.dart:12:3: Error: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
// foo() {}
// ^
diff --git a/pkg/front_end/testcases/regress/issue_32660.dart.strong.expect b/pkg/front_end/testcases/regress/issue_32660.dart.strong.expect
index a8975fa..4848bf0 100644
--- a/pkg/front_end/testcases/regress/issue_32660.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_32660.dart.strong.expect
@@ -1,6 +1,6 @@
// Formatted problems:
//
-// pkg/front_end/testcases/regress/issue_32660.dart:6:3: Error: The method 'A::foo' has fewer named arguments than those of overridden method 'B::foo'.
+// pkg/front_end/testcases/regress/issue_32660.dart:6:3: Error: The method 'A.foo' has fewer named arguments than those of overridden method 'B.foo'.
// foo(int x) => x;
// ^
// pkg/front_end/testcases/regress/issue_32660.dart:10:3: Context: This is the overridden method ('foo').
@@ -10,7 +10,7 @@
// class C extends A implements B {
// ^
//
-// pkg/front_end/testcases/regress/issue_32660.dart:21:3: Error: The method 'D::foo' has fewer named arguments than those of overridden method 'E::foo'.
+// pkg/front_end/testcases/regress/issue_32660.dart:21:3: Error: The method 'D.foo' has fewer named arguments than those of overridden method 'E.foo'.
// foo(int x) => x;
// ^
// pkg/front_end/testcases/regress/issue_32660.dart:25:3: Context: This is the overridden method ('foo').
@@ -22,11 +22,11 @@
// Unhandled errors:
//
-// pkg/front_end/testcases/regress/issue_32660.dart:6:3: Error: The method 'A::foo' has fewer named arguments than those of overridden method 'B::foo'.
+// pkg/front_end/testcases/regress/issue_32660.dart:6:3: Error: The method 'A.foo' has fewer named arguments than those of overridden method 'B.foo'.
// foo(int x) => x;
// ^
//
-// pkg/front_end/testcases/regress/issue_32660.dart:21:3: Error: The method 'D::foo' has fewer named arguments than those of overridden method 'E::foo'.
+// pkg/front_end/testcases/regress/issue_32660.dart:21:3: Error: The method 'D.foo' has fewer named arguments than those of overridden method 'E.foo'.
// foo(int x) => x;
// ^
diff --git a/pkg/front_end/testcases/regress/issue_32660.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_32660.dart.strong.transformed.expect
index 404937a..86d1097 100644
--- a/pkg/front_end/testcases/regress/issue_32660.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_32660.dart.strong.transformed.expect
@@ -1,10 +1,10 @@
// Unhandled errors:
//
-// pkg/front_end/testcases/regress/issue_32660.dart:6:3: Error: The method 'A::foo' has fewer named arguments than those of overridden method 'B::foo'.
+// pkg/front_end/testcases/regress/issue_32660.dart:6:3: Error: The method 'A.foo' has fewer named arguments than those of overridden method 'B.foo'.
// foo(int x) => x;
// ^
//
-// pkg/front_end/testcases/regress/issue_32660.dart:21:3: Error: The method 'D::foo' has fewer named arguments than those of overridden method 'E::foo'.
+// pkg/front_end/testcases/regress/issue_32660.dart:21:3: Error: The method 'D.foo' has fewer named arguments than those of overridden method 'E.foo'.
// foo(int x) => x;
// ^
