| Index: pkg/front_end/lib/src/fasta/kernel/kernel_library_builder.dart
|
| diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_library_builder.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_library_builder.dart
|
| index 9a6a89462099e3349a7f997630a50bc17314a1e7..f348a7784dddff1add62afa938808467b98c6eca 100644
|
| --- a/pkg/front_end/lib/src/fasta/kernel/kernel_library_builder.dart
|
| +++ b/pkg/front_end/lib/src/fasta/kernel/kernel_library_builder.dart
|
| @@ -13,6 +13,8 @@ import '../../scanner/token.dart' show Token;
|
| import '../fasta_codes.dart'
|
| show
|
| Message,
|
| + messageConflictsWithTypeVariableCause,
|
| + templateConflictsWithTypeVariable,
|
| templateDuplicatedExport,
|
| templateDuplicatedImport,
|
| templateExportHidesExport,
|
| @@ -158,10 +160,11 @@ class KernelLibraryBuilder
|
| if (typeVariablesByName != null) {
|
| TypeVariableBuilder tv = typeVariablesByName[name];
|
| if (tv != null) {
|
| - cls.deprecated_addCompileTimeError(
|
| - member.charOffset, "Conflict with type variable '$name'.");
|
| - cls.deprecated_addCompileTimeError(
|
| - tv.charOffset, "This is the type variable.");
|
| + cls.addCompileTimeError(
|
| + templateConflictsWithTypeVariable.withArguments(name),
|
| + member.charOffset);
|
| + cls.addCompileTimeError(
|
| + messageConflictsWithTypeVariableCause, tv.charOffset);
|
| }
|
| }
|
| setParent(name, member);
|
|
|