webui fixes for 0.8.9

lib/src/dart_parser.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.
 
 /**
  * Parser for Dart code based on the experimental analyzer.
  */
 library dart_parser;
 
-import 'dart:utf';
-import 'dart:math' as math;
 import 'package:analyzer_experimental/src/generated/ast.dart';
 import 'package:analyzer_experimental/src/generated/error.dart';
 import 'package:analyzer_experimental/src/generated/parser.dart';
 import 'package:analyzer_experimental/src/generated/scanner.dart';
 import 'package:source_maps/span.dart' show SourceFile, SourceFileSegment, Location;
-import 'info.dart';
 import 'messages.dart';
-import 'refactor.dart' show $CR, $LF;
 import 'utils.dart';
 
 /** Information extracted from a source Dart file. */
 class DartCodeInfo extends Hashable {
 
   /** Library qualified identifier, if any. */
   final String libraryName;
 
   /** Library which the code is part-of, if any. */
   final String partOf;
@@ skipping 73 matching lines @@
   for (var directive in unit.directives) {
     if (directive is LibraryDirective) {
       libraryName = directive.name.name;
     } else if (directive is PartOfDirective) {
       partName = directive.libraryName.name;
     } else {
       assert(directive is UriBasedDirective);
       // Normalize the library URI.
       var uriNode = directive.uri;
       if (uriNode is! SimpleStringLiteral) {
-        String uri = uriNode.accept(new ConstantEvaluator(null));
+        String uri = uriNode.accept(new ConstantEvaluator());
         directive.uri = createStringLiteral(uri);
       }
       directives.add(directive);
     }
   }
 
   var sourceFile = offset == null
       ? new SourceFile.text(path, code)
       : new SourceFileSegment(path, code, offset);
 
@@ skipping 11 matching lines @@
   var unit = parser.parseCompilationUnit(token);
 
   if (path == null || messages == null) return unit;
 
   // TODO(jmesserly): removed this for now because the analyzer doesn't format
   // messages properly, so you end up with things like "Unexpected token '%s'".
   // This used to convert parser messages into our messages. Enable this
   // once analyzer is fixed.
   // TODO(sigmund): once we enable this, we need to fix compiler.dart to clear
   // out the output of the compiler if we see compilation errors.
-  if (false) {
-    var file = new SourceFile.text(path, code);
-    for (var e in errorListener.errors) {
-      var span = file.span(e.offset, e.offset + e.length);
-
-      var severity = e.errorCode.errorSeverity;
-      if (severity == ErrorSeverity.ERROR) {
-        messages.error(e.message, span);
-      } else {
-        assert(severity == ErrorSeverity.WARNING);
-        messages.warning(e.message, span);
-      }
-    }
-  }
+  // if (false) {
+  //  var file = new SourceFile.text(path, code);
+  //  for (var e in errorListener.errors) {
+  //    var span = file.span(e.offset, e.offset + e.length);
+  //
+  //    var severity = e.errorCode.errorSeverity;
+  //    if (severity == ErrorSeverity.ERROR) {
+  //      messages.error(e.message, span);
+  //    } else {
+  //      assert(severity == ErrorSeverity.WARNING);
+  //      messages.warning(e.message, span);
+  //    }
+  //  }
+  // }
 
   return unit;
 }
 
 class _ErrorCollector extends AnalysisErrorListener {
   final errors = new List<AnalysisError>();
   onError(error) => errors.add(error);
 }