From eb2504dea335a4e10a7d8790cf1421941c590873 Mon Sep 17 00:00:00 2001 From: Michael Thomsen Date: Thu, 15 Sep 2022 16:41:29 +0000 Subject: [PATCH] Remove emoji from null safety terminal messages. They are not rendering correctly on Windows. Followup to https://dart-review.googlesource.com/c/sdk/+/257642 Change-Id: Id0193dea51e164f20ccb7a3087cd2995a742f348 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/259300 Reviewed-by: Chloe Stefantsova Commit-Queue: Michael Thomsen --- pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart | 4 ++-- pkg/dartdev/test/commands/run_test.dart | 3 +-- pkg/dartdev/test/no_such_file_test.dart | 2 +- pkg/front_end/messages.yaml | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart b/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart index c36f76de022..a96cb8e35f7 100644 --- a/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart +++ b/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart @@ -1074,7 +1074,7 @@ const Code codeCompilingWithSoundNullSafety = const MessageCode messageCompilingWithSoundNullSafety = const MessageCode( "CompilingWithSoundNullSafety", severity: Severity.info, - problemMessage: r"""Compiling with sound null safety 💪"""); + problemMessage: r"""Compiling with sound null safety."""); // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE. const Code codeCompilingWithoutSoundNullSafety = @@ -1084,7 +1084,7 @@ const Code codeCompilingWithoutSoundNullSafety = const MessageCode messageCompilingWithoutSoundNullSafety = const MessageCode( "CompilingWithoutSoundNullSafety", severity: Severity.info, - problemMessage: r"""Compiling without sound null safety ⚠️ + problemMessage: r"""Compiling without sound null safety! Dart 3 will only support sound null safety, see https://dart.dev/null-safety"""); // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE. diff --git a/pkg/dartdev/test/commands/run_test.dart b/pkg/dartdev/test/commands/run_test.dart index 14acfb20a6e..bf932f159d8 100644 --- a/pkg/dartdev/test/commands/run_test.dart +++ b/pkg/dartdev/test/commands/run_test.dart @@ -13,8 +13,7 @@ import 'package:test/test.dart'; import '../utils.dart'; -const String soundNullSafetyMessage = - 'Info: Compiling with sound null safety 💪'; +const String soundNullSafetyMessage = 'Info: Compiling with sound null safety.'; const devToolsMessagePrefix = 'The Dart DevTools debugger and profiler is available at: http://127.0.0.1:'; const dartVMServiceMessagePrefix = diff --git a/pkg/dartdev/test/no_such_file_test.dart b/pkg/dartdev/test/no_such_file_test.dart index 5cad0bbbe43..49a0d616393 100644 --- a/pkg/dartdev/test/no_such_file_test.dart +++ b/pkg/dartdev/test/no_such_file_test.dart @@ -34,7 +34,7 @@ void main() { expect(result.stderr, contains("Error when reading 'foo.dart':")); expect(result.stdout, isNotEmpty); expect( - result.stdout, contains('Info: Compiling with sound null safety 💪\n')); + result.stdout, contains('Info: Compiling with sound null safety.\n')); expect(result.exitCode, 254); }); } diff --git a/pkg/front_end/messages.yaml b/pkg/front_end/messages.yaml index 8b083701852..47824cca37f 100644 --- a/pkg/front_end/messages.yaml +++ b/pkg/front_end/messages.yaml @@ -5517,14 +5517,14 @@ UnexpectedModifierInNonNnbd: late int x; CompilingWithSoundNullSafety: - problemMessage: "Compiling with sound null safety 💪" + problemMessage: "Compiling with sound null safety." configuration: nnbd-strong,compile severity: INFO script: | main() {} CompilingWithoutSoundNullSafety: - problemMessage: "Compiling without sound null safety ⚠️\nDart 3 will only support sound null safety, see https://dart.dev/null-safety" + problemMessage: "Compiling without sound null safety!\nDart 3 will only support sound null safety, see https://dart.dev/null-safety" configuration: nnbd-weak,compile severity: INFO script: |