[front_end] Trim diagnostic correction messages.

There was already code to trim extra whitespace off the end of problem
messages. It makes sense to trim correction messages too.

Change-Id: I6a6a69641ec435c1e708c67c94792c6f159bb0b2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/447941
Commit-Queue: Paul Berry <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>

Author: stereotype441

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

@@ -892,8 +892,7 @@ codeCantUseDeferredPrefixAsConstant = const Template<Message Function(Token toke
   problemMessageTemplate:
       r"""'#lexeme' can't be used in a constant expression because it's marked as 'deferred' which means it isn't available until loaded.""",
   correctionMessageTemplate:
-      r"""Try moving the constant from the deferred library, or removing 'deferred' from the import.
-""",
+      r"""Try moving the constant from the deferred library, or removing 'deferred' from the import.""",
   withArgumentsOld: _withArgumentsOldCantUseDeferredPrefixAsConstant,
   analyzerCodes: <String>["CONST_DEFERRED_CLASS"],
 );
@@ -906,8 +905,7 @@ Message _withArgumentsOldCantUseDeferredPrefixAsConstant(Token token) {
     problemMessage:
         """'${lexeme}' can't be used in a constant expression because it's marked as 'deferred' which means it isn't available until loaded.""",
     correctionMessage:
-        """Try moving the constant from the deferred library, or removing 'deferred' from the import.
-""",
+        """Try moving the constant from the deferred library, or removing 'deferred' from the import.""",
     arguments: {'lexeme': token},
   );
 }
@@ -1248,8 +1246,7 @@ codeConstEvalDeferredLibrary = const Template<Message Function(String _nameOKEmp
   problemMessageTemplate:
       r"""'#nameOKEmpty' can't be used in a constant expression because it's marked as 'deferred' which means it isn't available until loaded.""",
   correctionMessageTemplate:
-      r"""Try moving the constant from the deferred library, or removing 'deferred' from the import.
-""",
+      r"""Try moving the constant from the deferred library, or removing 'deferred' from the import.""",
   withArgumentsOld: _withArgumentsOldConstEvalDeferredLibrary,
   analyzerCodes: <String>[
     "INVALID_ANNOTATION_CONSTANT_VALUE_FROM_DEFERRED_LIBRARY",
@@ -1264,8 +1261,7 @@ Message _withArgumentsOldConstEvalDeferredLibrary(String _nameOKEmpty) {
     problemMessage:
         """'${nameOKEmpty}' can't be used in a constant expression because it's marked as 'deferred' which means it isn't available until loaded.""",
     correctionMessage:
-        """Try moving the constant from the deferred library, or removing 'deferred' from the import.
-""",
+        """Try moving the constant from the deferred library, or removing 'deferred' from the import.""",
     arguments: {'nameOKEmpty': _nameOKEmpty},
   );
 }
@@ -9173,8 +9169,7 @@ codeMissingImplementationNotAbstract =
  - provide an implementation,
  - inherit an implementation from a superclass or mixin,
  - mark the class as abstract, or
- - provide a 'noSuchMethod' implementation.
-""",
+ - provide a 'noSuchMethod' implementation.""",
       withArgumentsOld: _withArgumentsOldMissingImplementationNotAbstract,
       analyzerCodes: <String>["CONCRETE_CLASS_WITH_ABSTRACT_MEMBER"],
     );
@@ -9197,8 +9192,7 @@ ${names}""",
  - provide an implementation,
  - inherit an implementation from a superclass or mixin,
  - mark the class as abstract, or
- - provide a 'noSuchMethod' implementation.
-""",
+ - provide a 'noSuchMethod' implementation.""",
     arguments: {'name': _name, 'names': _names},
   );
 }

pkg/front_end/testcases/enhanced_enums/abstract_members.dart.strong.expect

@@ -21,7 +21,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // enum E4 implements InterfaceMethod { // Error.
 //      ^^
 // pkg/front_end/testcases/enhanced_enums/abstract_members.dart:24:8: Context: 'InterfaceMethod.foo' is defined here.
@@ -35,7 +34,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // enum E5 implements InterfaceGetter { // Error.
 //      ^^
 // pkg/front_end/testcases/enhanced_enums/abstract_members.dart:32:11: Context: 'InterfaceGetter.foo' is defined here.
@@ -49,7 +47,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // enum E6 implements InterfaceSetter { // Error.
 //      ^^
 // pkg/front_end/testcases/enhanced_enums/abstract_members.dart:40:12: Context: 'InterfaceSetter.foo=' is defined here.

pkg/front_end/testcases/enhanced_enums/abstract_members.dart.strong.modular.expect

@@ -21,7 +21,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // enum E4 implements InterfaceMethod { // Error.
 //      ^^
 // pkg/front_end/testcases/enhanced_enums/abstract_members.dart:24:8: Context: 'InterfaceMethod.foo' is defined here.
@@ -35,7 +34,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // enum E5 implements InterfaceGetter { // Error.
 //      ^^
 // pkg/front_end/testcases/enhanced_enums/abstract_members.dart:32:11: Context: 'InterfaceGetter.foo' is defined here.
@@ -49,7 +47,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // enum E6 implements InterfaceSetter { // Error.
 //      ^^
 // pkg/front_end/testcases/enhanced_enums/abstract_members.dart:40:12: Context: 'InterfaceSetter.foo=' is defined here.

pkg/front_end/testcases/enhanced_enums/abstract_members.dart.strong.outline.expect

@@ -21,7 +21,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // enum E4 implements InterfaceMethod { // Error.
 //      ^^
 // pkg/front_end/testcases/enhanced_enums/abstract_members.dart:24:8: Context: 'InterfaceMethod.foo' is defined here.
@@ -35,7 +34,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // enum E5 implements InterfaceGetter { // Error.
 //      ^^
 // pkg/front_end/testcases/enhanced_enums/abstract_members.dart:32:11: Context: 'InterfaceGetter.foo' is defined here.
@@ -49,7 +47,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // enum E6 implements InterfaceSetter { // Error.
 //      ^^
 // pkg/front_end/testcases/enhanced_enums/abstract_members.dart:40:12: Context: 'InterfaceSetter.foo=' is defined here.

pkg/front_end/testcases/enhanced_enums/abstract_members.dart.strong.transformed.expect

@@ -21,7 +21,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // enum E4 implements InterfaceMethod { // Error.
 //      ^^
 // pkg/front_end/testcases/enhanced_enums/abstract_members.dart:24:8: Context: 'InterfaceMethod.foo' is defined here.
@@ -35,7 +34,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // enum E5 implements InterfaceGetter { // Error.
 //      ^^
 // pkg/front_end/testcases/enhanced_enums/abstract_members.dart:32:11: Context: 'InterfaceGetter.foo' is defined here.
@@ -49,7 +47,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // enum E6 implements InterfaceSetter { // Error.
 //      ^^
 // pkg/front_end/testcases/enhanced_enums/abstract_members.dart:40:12: Context: 'InterfaceSetter.foo=' is defined here.

pkg/front_end/testcases/enhanced_enums/enum_as_supertype_error.dart.strong.expect

@@ -37,7 +37,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class A extends Enum { // Error.
 //       ^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.
@@ -51,7 +50,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class B implements Enum { // Error.
 //       ^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.
@@ -65,7 +63,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class EnumClass2 extends AbstractEnumClass {} // Error.
 //       ^^^^^^^^^^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.
@@ -79,7 +76,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class EnumClass3 extends AbstractEnumClass2 {} // Error.
 //       ^^^^^^^^^^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.

pkg/front_end/testcases/enhanced_enums/enum_as_supertype_error.dart.strong.modular.expect

@@ -37,7 +37,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class A extends Enum { // Error.
 //       ^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.
@@ -51,7 +50,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class B implements Enum { // Error.
 //       ^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.
@@ -65,7 +63,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class EnumClass2 extends AbstractEnumClass {} // Error.
 //       ^^^^^^^^^^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.
@@ -79,7 +76,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class EnumClass3 extends AbstractEnumClass2 {} // Error.
 //       ^^^^^^^^^^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.

pkg/front_end/testcases/enhanced_enums/enum_as_supertype_error.dart.strong.outline.expect

@@ -37,7 +37,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class A extends Enum { // Error.
 //       ^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.
@@ -51,7 +50,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class B implements Enum { // Error.
 //       ^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.
@@ -65,7 +63,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class EnumClass2 extends AbstractEnumClass {} // Error.
 //       ^^^^^^^^^^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.
@@ -79,7 +76,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class EnumClass3 extends AbstractEnumClass2 {} // Error.
 //       ^^^^^^^^^^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.

pkg/front_end/testcases/enhanced_enums/enum_as_supertype_error.dart.strong.transformed.expect

@@ -37,7 +37,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class A extends Enum { // Error.
 //       ^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.
@@ -51,7 +50,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class B implements Enum { // Error.
 //       ^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.
@@ -65,7 +63,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class EnumClass2 extends AbstractEnumClass {} // Error.
 //       ^^^^^^^^^^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.
@@ -79,7 +76,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // class EnumClass3 extends AbstractEnumClass2 {} // Error.
 //       ^^^^^^^^^^
 // sdk/lib/core/enum.dart:*: Context: 'Enum.index' is defined here.

pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.strong.expect

@@ -14,7 +14,6 @@ library;
 //  - inherit an implementation from a superclass or mixin,
 //  - mark the class as abstract, or
 //  - provide a 'noSuchMethod' implementation.
-//
 // enum E2 implements I { // Error.
 //      ^^
 // pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart:6:8: Context: 'I.foo' is defined here.