Address comments from CL 125123002 and additional cleanup.

dart/site/try/leap.dart

 // Copyright (c) 2013, 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 trydart.main;
 
 import 'dart:async';
 import 'dart:html';
 import 'dart:isolate';
 import 'dart:uri';
 
-import '../sdk/lib/_internal/compiler/implementation/scanner/scannerlib.dart' show StringScanner, EOF_TOKEN;
-import '../sdk/lib/_internal/compiler/implementation/scanner/scannerlib.dart' as scanner;
+import '../sdk/lib/_internal/compiler/implementation/scanner/scannerlib.dart'
+  show
+    StringScanner,
+    EOF_TOKEN;
+
+import '../sdk/lib/_internal/compiler/implementation/scanner/scannerlib.dart'
+  as scanner;
 
 import 'decoration.dart';
 import 'themes.dart';
 
 @lazy import 'compiler_isolate.dart';
 
 const lazy = const DeferredLibrary('compiler_isolate');
 
 var inputPre;
 var outputDiv;
 var hackDiv;
 var outputFrame;
 var compilerTimer;
 var compilerPort;
 var observer;
 var cacheStatusElement;
 bool alwaysRunInWorker = window.localStorage['alwaysRunInWorker'] == 'true';
 bool verboseCompiler = window.localStorage['verboseCompiler'] == 'true';
 bool minified = window.localStorage['minified'] == 'true';
 bool onlyAnalyze = window.localStorage['onlyAnalyze'] == 'true';
-String codeFont = ((x) => x == null ? '' : x)(window.localStorage['codeFont']);
+final String rawCodeFont = window.localStorage['codeFont'];
+String codeFont = rawCodeFont == null ? '' : rawCodeFont;
 String currentSample = window.localStorage['currentSample'];
 Theme currentTheme = Theme.named(window.localStorage['theme']);
 bool applyingSettings = false;
 
 const String INDENT = '\u{a0}\u{a0}';
 
 onKeyUp(KeyboardEvent e) {
   if (e.keyCode == 13) {
     e.preventDefault();
     DomSelection selection = window.getSelection();
     if (selection.isCollapsed && selection.anchorNode is Text) {
       Text text = selection.anchorNode;
       int offset = selection.anchorOffset;
       text.insertData(offset, '\n');
       selection.collapse(text, offset + 1);
     }
   }
   // This is a hack to get Safari to send mutation events on contenteditable.
   var newDiv = new DivElement();
   hackDiv.replaceWith(newDiv);
   hackDiv = newDiv;
 }
 
 bool isMalformedInput = false;
 String currentSource = "";
 
+// TODO(ahe): This method should be cleaned up. It is too large.
 onMutation(List<MutationRecord> mutations, MutationObserver observer) {
   scheduleCompilation();
 
   for (Element element in inputPre.queryAll('a[class="diagnostic"]>span')) {
     element.remove();
   }
   // Discard clean-up mutations.
   observer.takeRecords();
 
   DomSelection selection = window.getSelection();
 
   while (!mutations.isEmpty) {
     for (MutationRecord record in mutations) {
       String type = record.type;
       switch (type) {
 
-      case 'characterData':
+        case 'characterData':
 
-        bool hasSelection = false;
-        int offset = selection.anchorOffset;
-        if (selection.isCollapsed && selection.anchorNode == record.target) {
-          hasSelection = true;
-        }
-        var parent = record.target.parentNode;
-        if (parent != inputPre) {
-          inlineChildren(parent);
-        }
-        if (hasSelection) {
-          selection.collapse(record.target, offset);
-        }
-        break;
+          bool hasSelection = false;
+          int offset = selection.anchorOffset;
+          if (selection.isCollapsed && selection.anchorNode == record.target) {
+            hasSelection = true;
+          }
+          var parent = record.target.parentNode;
+          if (parent != inputPre) {
+            inlineChildren(parent);
+          }
+          if (hasSelection) {
+            selection.collapse(record.target, offset);
+          }
+          break;
 
-      default:
-        if (!record.addedNodes.isEmpty) {
-          for (var node in record.addedNodes) {
+        default:
+          if (!record.addedNodes.isEmpty) {
+            for (var node in record.addedNodes) {
 
-            if (node.nodeType != Node.ELEMENT_NODE) continue;
+              if (node.nodeType != Node.ELEMENT_NODE) continue;
 
-            if (node is BRElement) {
-              if (selection.anchorNode != node) {
-                node.replaceWith(new Text('\n'));
+              if (node is BRElement) {
+                if (selection.anchorNode != node) {
+                  node.replaceWith(new Text('\n'));
+                }
+              } else {
+                var parent = node.parentNode;
+                if (parent == null) continue;
+                var nodes = new List.from(node.nodes);
+                var style = node.getComputedStyle();
+                if (style.display != 'inline') {
+                  var previous = node.previousNode;
+                  if (previous is Text) {
+                    previous.appendData('\n');
+                  } else {
+                    parent.insertBefore(new Text('\n'), node);
+                  }
+                }
+                for (Node child in nodes) {
+                  child.remove();
+                  parent.insertBefore(child, node);
+                }
+                node.remove();
               }
-            } else {
-              var parent = node.parentNode;
-              if (parent == null) continue;
-              var nodes = new List.from(node.nodes);
-              var style = node.getComputedStyle();
-              if (style.display != 'inline') {
-                var previous = node.previousNode;
-                if (previous is Text) {
-                  previous.appendData('\n');
-                } else {
-                  parent.insertBefore(new Text('\n'), node);
-                }
-              }
-              for (Node child in nodes) {
-                child.remove();
-                parent.insertBefore(child, node);
-              }
-              node.remove();
             }
           }
-        }
       }
     }
     mutations = observer.takeRecords();
   }
 
   if (!inputPre.nodes.isEmpty && inputPre.nodes.last is Text) {
     Text text = inputPre.nodes.last;
     if (!text.text.endsWith('\n')) {
       text.appendData('\n');
     }
   }
 
   int offset = 0;
   int anchorOffset = 0;
   bool hasSelection = false;
   Node anchorNode = selection.anchorNode;
+  // TODO(ahe): Try to share walk4 methods.
   void walk4(Node node) {
     // TODO(ahe): Use TreeWalker when that is exposed.
     // function textNodesUnder(root){
-    //   var n, a=[], walk=document.createTreeWalker(root,NodeFilter.SHOW_TEXT,null,false);
+    //   var n, a=[], walk=document.createTreeWalker(
+    //       root,NodeFilter.SHOW_TEXT,null,false);
     //   while(n=walk.nextNode()) a.push(n);
     //   return a;
     // }
     int type = node.nodeType;
     if (type == Node.TEXT_NODE || type == Node.CDATA_SECTION_NODE) {
       if (anchorNode == node) {
         hasSelection = true;
         anchorOffset = selection.anchorOffset + offset;
         return;
       }
       offset += node.length;
     }
 
     var child = node.$dom_firstChild;
-    while(child != null) {
+    while (child != null) {
       walk4(child);
       if (hasSelection) return;
       child = child.nextNode;
     }
   }
   if (selection.isCollapsed) {
     walk4(inputPre);
   }
 
   currentSource = inputPre.text;
@@ skipping 95 matching lines @@
       child = child.nextNode;
     }
   }
   walk4(inputPre);
 
   if (!foundNode) {
     outputDiv.appendText('$message\n');
   }
 
   observer.takeRecords();
-  observer.observe(inputPre, childList: true, characterData: true, subtree: true);
+  observer.observe(
+      inputPre, childList: true, characterData: true, subtree: true);
 }
 
 void inlineChildren(Element element) {
   if (element == null) return;
   var parent = element.parentNode;
   if (parent == null) return;
   for (Node child in new List.from(element.nodes)) {
     child.remove();
     parent.insertBefore(child, element);
   }
@@ skipping 71 matching lines @@
 
   void dispose() {
     if (worker != null) worker.terminate();
     objectUrls.forEach(Url.revokeObjectUrl);
   }
 
   onMessage(message, _) {
     String kind = message is String ? message : message[0];
     var data = (message is List && message.length == 2) ? message[1] : null;
     switch (kind) {
-    case 'done': return onDone(data);
-    case 'url': return onUrl(data);
-    case 'code': return onCode(data);
-    case 'diagnostic': return onDiagnostic(data);
-    case 'crash': return onCrash(data);
-    case 'failed': return onFail(data);
-    case 'dart:html': return onDartHtml(data);
-    default:
-      throw ['Unknown message kind', message];
+      case 'done': return onDone(data);
+      case 'url': return onUrl(data);
+      case 'code': return onCode(data);
+      case 'diagnostic': return onDiagnostic(data);
+      case 'crash': return onCrash(data);
+      case 'failed': return onFail(data);
+      case 'dart:html': return onDartHtml(data);
+      default:
+        throw ['Unknown message kind', message];
     }
   }
 
   onDartHtml(_) {
     usesDartHtml = true;
   }
 
   onFail(_) {
     clear();
     consolePrint('Compilation failed');
@@ skipping 503 matching lines @@
   buildCheckBox(String text, bool defaultValue, void action(Event e)) {
     var checkBox = new CheckboxInputElement()
         ..defaultChecked = defaultValue
         ..onChange.listen(action);
     return new LabelElement()
         ..classes.add('checkbox')
         ..append(checkBox)
         ..appendText(' $text');
   }
 
+  // TODO(ahe): Build abstraction for flags/options.
   fieldSet.append(
       buildCheckBox(
           'Always run in Worker thread.', alwaysRunInWorker,
           (Event e) { alwaysRunInWorker = e.target.checked; }));
 
   fieldSet.append(
       buildCheckBox(
           'Verbose compiler output.', verboseCompiler,
           (Event e) { verboseCompiler = e.target.checked; }));
 
@@ skipping 350 matching lines @@
 }
 
 .center {
   display: block;
   margin: 0px auto;
   text-align: center;
 }
 """;
 
 ''';