Tweaks for the status page.

pkg/analysis_server/lib/src/status/get_handler.dart

 // Copyright (c) 2014, 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.
 
 library analysis_server.src.status.get_handler;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';
@@ skipping 1536 matching lines @@
     }
 
     if (handler != null) {
       buffer.write('<h3>Execution Domain</h3>');
       _writeTwoColumns(buffer, (StringBuffer buffer) {
         _writeSubscriptionList(buffer, ExecutionService.VALUES, services);
       }, (StringBuffer buffer) {});
     }
   }
 
+  void _writeListItem(StringBuffer buffer, writer()) {
+    buffer.write('<li>');
+    writer();
+    buffer.write('</li>');
+  }
+
   void _writeListOfStrings(
       StringBuffer buffer, String listName, Iterable<String> items) {
     List<String> itemList = items.toList();
     itemList.sort((String a, String b) {
       a = a.toLowerCase();
       b = b.toLowerCase();
       return a.compareTo(b);
     });
-    buffer.write('List "listName" containing ${itemList.length} entries:');
+    buffer.write('List "$listName" containing ${itemList.length} entries:');
     buffer.write('<ul>');
     for (String member in itemList) {
-      buffer.write('<li>');
-      buffer.write(member);
-      buffer.write('</li>');
+      _writeListItem(buffer, () {
+        buffer.write(member);
+      });
     }
     buffer.write('</ul>');
   }
 
   /**
    * Write a representation of an analysis option with the given [name] and
    * [value] to the given [buffer]. The option should be separated from other
    * options unless the [last] flag is true, indicating that this is the last
    * option in the list of options.
    */
@@ skipping 340 matching lines @@
   void _writeValueAsHtml(
       StringBuffer buffer, Object value, Map<String, String> linkParameters) {
     if (value == null) {
       buffer.write('<i>null</i>');
     } else if (value is String) {
       buffer.write('<pre>${HTML_ESCAPE.convert(value)}</pre>');
     } else if (value is List) {
       buffer.write('List containing ${value.length} entries');
       buffer.write('<ul>');
       for (var entry in value) {
-        buffer.write('<li>');
-        _writeValueAsHtml(buffer, entry, linkParameters);
-        buffer.write('</li>');
+        _writeListItem(buffer, () {
+          _writeValueAsHtml(buffer, entry, linkParameters);
+        });
       }
       buffer.write('</ul>');
     } else if (value is AstNode) {
       String link =
           makeLink(AST_PATH, linkParameters, value.runtimeType.toString());
       buffer.write('<i>$link</i>');
     } else if (value is Element) {
       String link =
           makeLink(ELEMENT_PATH, linkParameters, value.runtimeType.toString());
       buffer.write('<i>$link</i>');
     } else if (value is UsedLocalElements) {
       buffer.write('<ul>');
-      {
+      _writeListItem(buffer, () {
         HashSet<Element> elements = value.elements;
         buffer.write('List "elements" containing ${elements.length} entries');
         buffer.write('<ul>');
         for (Element element in elements) {
-          buffer.write('<li>');
-          buffer.write('<i>${element.runtimeType}</i>  $element');
-          buffer.write('</li>');
+          _writeListItem(buffer, () {
+            String elementStr = HTML_ESCAPE.convert(element.toString());
+            buffer.write('<i>${element.runtimeType}</i>  $elementStr');
+          });
         }
         buffer.write('</ul>');
-      }
-      _writeListOfStrings(buffer, 'members', value.members);
-      _writeListOfStrings(buffer, 'readMembers', value.readMembers);
+      });
+      _writeListItem(buffer, () {
+        _writeListOfStrings(buffer, 'members', value.members);
+      });
+      _writeListItem(buffer, () {
+        _writeListOfStrings(buffer, 'readMembers', value.readMembers);
+      });
       buffer.write('</ul>');
     } else {
       buffer.write(HTML_ESCAPE.convert(value.toString()));
       buffer.write(' <i>(${value.runtimeType.toString()})</i>');
     }
   }
 
   /**
    * Create a link to [path] with query parameters [params], with inner HTML
    * [innerHtml]. If [hasError] is `true`, then the link will have the class
    * 'error'.
    */
   static String makeLink(
       String path, Map<String, String> params, String innerHtml,
       [bool hasError = false]) {
     Uri uri = new Uri(path: path, queryParameters: params);
     String href = HTML_ESCAPE.convert(uri.toString());
     String classAttribute = hasError ? ' class="error"' : '';
     return '<a href="$href"$classAttribute>$innerHtml</a>';
   }
 }