Pending renames and cleanups after commits

pkg/compiler/lib/src/diagnostics/messages.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /// The messages in this file should follow the [Guide for Writing
 /// Diagnostics](../../../../front_end/lib/src/fasta/diagnostics.md).
 ///
 /// Other things to keep in mind:
 ///
 /// An INFO message should always be preceded by a non-INFO message, and the
@@ skipping 2016 matching lines @@
               'part.dart': """
 part of lib.bar;
 """
             }
           ]),
 
       MessageKind.LIBRARY_URI_MISMATCH: const MessageTemplate(
           MessageKind.LIBRARY_URI_MISMATCH,
           "Expected URI of library '#{libraryUri}'.",
           howToFix: "Try changing the directive to 'part of "
-                    "\"#{libraryUri}\";'.",
+              "\"#{libraryUri}\";'.",
           examples: const [
             const {
               'main.dart': """
 library lib.foo;
 
 part 'part.dart';
 
 main() {}
 """,
               'part.dart': """
@@ skipping 1239 matching lines @@
       MessageKind.HIDDEN_HINTS: const MessageTemplate(
           MessageKind.HIDDEN_HINTS, "#{hints} hint(s) suppressed in #{uri}."),
 
       MessageKind.PREAMBLE: const MessageTemplate(
           MessageKind.PREAMBLE,
           "When run on the command-line, the compiled output might"
           " require a preamble file located in:\n"
           "  <sdk>/lib/_internal/js_runtime/lib/preambles."),
 
       MessageKind.INVALID_INLINE_FUNCTION_TYPE: const MessageTemplate(
-          MessageKind.INVALID_INLINE_FUNCTION_TYPE,
-          "Invalid inline function type.",
-          howToFix: "Try changing the inline function type (as in 'int f()') to"
-             " a prefixed function type using the `Function` keyword (as in "
-             "'int Function() f').",
-          examples:
-              const ["typedef F = Function(int f(String x)); main() { F f; }"],
+        MessageKind.INVALID_INLINE_FUNCTION_TYPE,
+        "Invalid inline function type.",
+        howToFix: "Try changing the inline function type (as in 'int f()') to"
+            " a prefixed function type using the `Function` keyword (as in "
+            "'int Function() f').",
+        examples: const [
+          "typedef F = Function(int f(String x)); main() { F f; }"
+        ],
       ),
 
       MessageKind.INVALID_SYNC_MODIFIER: const MessageTemplate(
           MessageKind.INVALID_SYNC_MODIFIER, "Invalid modifier 'sync'.",
           howToFix: "Try replacing 'sync' with 'sync*'.",
           examples: const ["main() sync {}"]),
 
       MessageKind.INVALID_AWAIT_FOR: const MessageTemplate(
           MessageKind.INVALID_AWAIT_FOR,
           "'await' is only supported on for-in loops.",
@@ skipping 477 matching lines @@
   static String convertToString(value) {
     if (value is ErrorToken) {
       // Shouldn't happen.
       return value.assertionMessage;
     } else if (value is Token) {
       value = value.lexeme;
     }
     return '$value';
   }
 }