New analyzer snapshot.

pkg/analyzer/test/generated/resolver_test.dart

 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
+
 library engine.resolver_test;
+
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/generated/java_junit.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/generated/error.dart';
 import 'package:analyzer/src/generated/scanner.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/parser.dart' show ParserErrorCode;
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_engine_io.dart';
 import 'package:analyzer/src/generated/sdk.dart' show DartSdk;
 import 'package:analyzer/src/generated/sdk_io.dart' show DirectoryBasedDartSdk;
 import 'package:unittest/unittest.dart' as _ut;
 import 'test_support.dart';
 import 'ast_test.dart' show ASTFactory;
 import 'element_test.dart' show ElementFactory;
+
 class TypePropagationTest extends ResolverTestCase {
   void fail_propagatedReturnType_functionExpression() {
     String code = EngineTestCase.createSource(["main() {", "  var v = (() {return 42;})();", "}"]);
     check_propagatedReturnType(code, typeProvider.dynamicType, typeProvider.intType);
   }
+
   void test_as() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  bool get g => true;",
         "}",
         "A f(var p) {",
         "  if ((p as A).g) {",
         "    return p;",
         "  } else {",
         "    return null;",
         "  }",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     ClassDeclaration classA = unit.declarations[0] as ClassDeclaration;
     InterfaceType typeA = classA.element.type;
     FunctionDeclaration function = unit.declarations[1] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     IfStatement ifStatement = body.block.statements[0] as IfStatement;
-    ReturnStatement statement = ((ifStatement.thenStatement as Block)).statements[0] as ReturnStatement;
+    ReturnStatement statement = (ifStatement.thenStatement as Block).statements[0] as ReturnStatement;
     SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeA, variableName.propagatedType);
   }
+
   void test_assert() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "A f(var p) {",
         "  assert (p is A);",
         "  return p;",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     ClassDeclaration classA = unit.declarations[0] as ClassDeclaration;
     InterfaceType typeA = classA.element.type;
     FunctionDeclaration function = unit.declarations[1] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     ReturnStatement statement = body.block.statements[1] as ReturnStatement;
     SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeA, variableName.propagatedType);
   }
+
   void test_assignment() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  var v;", "  v = 0;", "  return v;", "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     ReturnStatement statement = body.block.statements[2] as ReturnStatement;
     SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeProvider.intType, variableName.propagatedType);
   }
+
   void test_assignment_afterInitializer() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  var v = 0;", "  v = 1.0;", "  return v;", "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     ReturnStatement statement = body.block.statements[2] as ReturnStatement;
     SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeProvider.doubleType, variableName.propagatedType);
   }
+
   void test_forEach() {
     String code = EngineTestCase.createSource([
         "f(List<String> p) {",
         "  for (var e in p) {",
         "    e;",
         "  }",
         "}"]);
     Source source = addSource(code);
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     InterfaceType stringType = typeProvider.stringType;
     {
       SimpleIdentifier identifier = EngineTestCase.findNode(unit, code, "e in", SimpleIdentifier);
       JUnitTestCase.assertSame(stringType, identifier.propagatedType);
     }
     {
       SimpleIdentifier identifier = EngineTestCase.findNode(unit, code, "e;", SimpleIdentifier);
       JUnitTestCase.assertSame(stringType, identifier.propagatedType);
     }
   }
+
   void test_functionExpression_asInvocationArgument() {
     String code = EngineTestCase.createSource([
         "class MyMap<K, V> {",
         "  forEach(f(K key, V value)) {}",
         "}",
         "f(MyMap<int, String> m) {",
         "  m.forEach((k, v) {",
         "    k;",
         "    v;",
         "  });",
         "}"]);
     Source source = addSource(code);
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     Type2 intType = typeProvider.intType;
     FormalParameter kParameter = EngineTestCase.findNode(unit, code, "k, ", SimpleFormalParameter);
     JUnitTestCase.assertSame(intType, kParameter.identifier.propagatedType);
     SimpleIdentifier kIdentifier = EngineTestCase.findNode(unit, code, "k;", SimpleIdentifier);
     JUnitTestCase.assertSame(intType, kIdentifier.propagatedType);
     JUnitTestCase.assertSame(typeProvider.dynamicType, kIdentifier.staticType);
     Type2 stringType = typeProvider.stringType;
     FormalParameter vParameter = EngineTestCase.findNode(unit, code, "v)", SimpleFormalParameter);
     JUnitTestCase.assertSame(stringType, vParameter.identifier.propagatedType);
     SimpleIdentifier vIdentifier = EngineTestCase.findNode(unit, code, "v;", SimpleIdentifier);
     JUnitTestCase.assertSame(stringType, vIdentifier.propagatedType);
     JUnitTestCase.assertSame(typeProvider.dynamicType, vIdentifier.staticType);
   }
+
   void test_functionExpression_asInvocationArgument_fromInferredInvocation() {
     String code = EngineTestCase.createSource([
         "class MyMap<K, V> {",
         "  forEach(f(K key, V value)) {}",
         "}",
         "f(MyMap<int, String> m) {",
         "  var m2 = m;",
         "  m2.forEach((k, v) {});",
         "}"]);
     Source source = addSource(code);
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     Type2 intType = typeProvider.intType;
     FormalParameter kParameter = EngineTestCase.findNode(unit, code, "k, ", SimpleFormalParameter);
     JUnitTestCase.assertSame(intType, kParameter.identifier.propagatedType);
     Type2 stringType = typeProvider.stringType;
     FormalParameter vParameter = EngineTestCase.findNode(unit, code, "v)", SimpleFormalParameter);
     JUnitTestCase.assertSame(stringType, vParameter.identifier.propagatedType);
   }
+
   void test_functionExpression_asInvocationArgument_functionExpressionInvocation() {
     String code = EngineTestCase.createSource([
         "main() {",
         "  (f(String value)) {} ((v) {",
         "    v;",
         "  });",
         "}"]);
     Source source = addSource(code);
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     Type2 dynamicType = typeProvider.dynamicType;
     Type2 stringType = typeProvider.stringType;
     FormalParameter vParameter = EngineTestCase.findNode(unit, code, "v)", FormalParameter);
     JUnitTestCase.assertSame(stringType, vParameter.identifier.propagatedType);
     JUnitTestCase.assertSame(dynamicType, vParameter.identifier.staticType);
     SimpleIdentifier vIdentifier = EngineTestCase.findNode(unit, code, "v;", SimpleIdentifier);
     JUnitTestCase.assertSame(stringType, vIdentifier.propagatedType);
     JUnitTestCase.assertSame(dynamicType, vIdentifier.staticType);
   }
+
   void test_functionExpression_asInvocationArgument_keepIfLessSpecific() {
     String code = EngineTestCase.createSource([
         "class MyList {",
         "  forEach(f(Object value)) {}",
         "}",
         "f(MyList list) {",
         "  list.forEach((int v) {",
         "    v;",
         "  });",
         "}"]);
     Source source = addSource(code);
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     Type2 intType = typeProvider.intType;
     FormalParameter vParameter = EngineTestCase.findNode(unit, code, "v)", SimpleFormalParameter);
     JUnitTestCase.assertSame(null, vParameter.identifier.propagatedType);
     JUnitTestCase.assertSame(intType, vParameter.identifier.staticType);
     SimpleIdentifier vIdentifier = EngineTestCase.findNode(unit, code, "v;", SimpleIdentifier);
     JUnitTestCase.assertSame(intType, vIdentifier.staticType);
     JUnitTestCase.assertSame(null, vIdentifier.propagatedType);
   }
+
   void test_functionExpression_asInvocationArgument_replaceIfMoreSpecific() {
     String code = EngineTestCase.createSource([
         "class MyList<E> {",
         "  forEach(f(E value)) {}",
         "}",
         "f(MyList<String> list) {",
         "  list.forEach((Object v) {",
         "    v;",
         "  });",
         "}"]);
     Source source = addSource(code);
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     Type2 stringType = typeProvider.stringType;
     FormalParameter vParameter = EngineTestCase.findNode(unit, code, "v)", SimpleFormalParameter);
     JUnitTestCase.assertSame(stringType, vParameter.identifier.propagatedType);
     JUnitTestCase.assertSame(typeProvider.objectType, vParameter.identifier.staticType);
     SimpleIdentifier vIdentifier = EngineTestCase.findNode(unit, code, "v;", SimpleIdentifier);
     JUnitTestCase.assertSame(stringType, vIdentifier.propagatedType);
   }
+
   void test_Future_then() {
     String code = EngineTestCase.createSource([
         "import 'dart:async';",
         "main(Future<int> firstFuture) {",
         "  firstFuture.then((p1) {",
         "    return 1.0;",
         "  }).then((p2) {",
         "    return new Future<String>.value('str');",
         "  }).then((p3) {",
         "  });",
         "}"]);
     Source source = addSource(code);
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     FormalParameter p1 = EngineTestCase.findNode(unit, code, "p1) {", SimpleFormalParameter);
     JUnitTestCase.assertSame(typeProvider.intType, p1.identifier.propagatedType);
     FormalParameter p2 = EngineTestCase.findNode(unit, code, "p2) {", SimpleFormalParameter);
     JUnitTestCase.assertSame(typeProvider.doubleType, p2.identifier.propagatedType);
     FormalParameter p3 = EngineTestCase.findNode(unit, code, "p3) {", SimpleFormalParameter);
     JUnitTestCase.assertSame(typeProvider.stringType, p3.identifier.propagatedType);
   }
+
   void test_initializer() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  var v = 0;", "  return v;", "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     NodeList<Statement> statements = body.block.statements;
     {
       VariableDeclarationStatement statement = statements[0] as VariableDeclarationStatement;
       SimpleIdentifier variableName = statement.variables.variables[0].name;
       JUnitTestCase.assertSame(typeProvider.dynamicType, variableName.staticType);
       JUnitTestCase.assertSame(typeProvider.intType, variableName.propagatedType);
     }
     {
       ReturnStatement statement = statements[1] as ReturnStatement;
       SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
       JUnitTestCase.assertSame(typeProvider.intType, variableName.propagatedType);
     }
   }
+
   void test_initializer_dereference() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  var v = 'String';", "  v.", "}"]));
     LibraryElement library = resolve(source);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     ExpressionStatement statement = body.block.statements[1] as ExpressionStatement;
     PrefixedIdentifier invocation = statement.expression as PrefixedIdentifier;
     SimpleIdentifier variableName = invocation.prefix;
     JUnitTestCase.assertSame(typeProvider.stringType, variableName.propagatedType);
   }
+
   void test_is_conditional() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "A f(var p) {",
         "  return (p is A) ? p : null;",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     ClassDeclaration classA = unit.declarations[0] as ClassDeclaration;
     InterfaceType typeA = classA.element.type;
     FunctionDeclaration function = unit.declarations[1] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     ReturnStatement statement = body.block.statements[0] as ReturnStatement;
     ConditionalExpression conditional = statement.expression as ConditionalExpression;
     SimpleIdentifier variableName = conditional.thenExpression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeA, variableName.propagatedType);
   }
+
   void test_is_if() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "A f(var p) {",
         "  if (p is A) {",
         "    return p;",
         "  } else {",
         "    return null;",
         "  }",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     ClassDeclaration classA = unit.declarations[0] as ClassDeclaration;
     InterfaceType typeA = classA.element.type;
     FunctionDeclaration function = unit.declarations[1] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     IfStatement ifStatement = body.block.statements[0] as IfStatement;
-    ReturnStatement statement = ((ifStatement.thenStatement as Block)).statements[0] as ReturnStatement;
+    ReturnStatement statement = (ifStatement.thenStatement as Block).statements[0] as ReturnStatement;
     SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeA, variableName.propagatedType);
   }
+
   void test_is_if_lessSpecific() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "A f(A p) {",
         "  if (p is String) {",
         "    return p;",
         "  } else {",
         "    return null;",
         "  }",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     FunctionDeclaration function = unit.declarations[1] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     IfStatement ifStatement = body.block.statements[0] as IfStatement;
-    ReturnStatement statement = ((ifStatement.thenStatement as Block)).statements[0] as ReturnStatement;
+    ReturnStatement statement = (ifStatement.thenStatement as Block).statements[0] as ReturnStatement;
     SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
     JUnitTestCase.assertSame(null, variableName.propagatedType);
   }
+
   void test_is_if_logicalAnd() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "A f(var p) {",
         "  if (p is A && p != null) {",
         "    return p;",
         "  } else {",
         "    return null;",
         "  }",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     ClassDeclaration classA = unit.declarations[0] as ClassDeclaration;
     InterfaceType typeA = classA.element.type;
     FunctionDeclaration function = unit.declarations[1] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     IfStatement ifStatement = body.block.statements[0] as IfStatement;
-    ReturnStatement statement = ((ifStatement.thenStatement as Block)).statements[0] as ReturnStatement;
+    ReturnStatement statement = (ifStatement.thenStatement as Block).statements[0] as ReturnStatement;
     SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeA, variableName.propagatedType);
   }
+
   void test_is_postConditional() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "A f(var p) {",
         "  A a = (p is A) ? p : throw null;",
         "  return p;",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     ClassDeclaration classA = unit.declarations[0] as ClassDeclaration;
     InterfaceType typeA = classA.element.type;
     FunctionDeclaration function = unit.declarations[1] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     ReturnStatement statement = body.block.statements[1] as ReturnStatement;
     SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeA, variableName.propagatedType);
   }
+
   void test_is_postIf() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "A f(var p) {",
         "  if (p is A) {",
         "    A a = p;",
         "  } else {",
         "    return null;",
         "  }",
         "  return p;",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     ClassDeclaration classA = unit.declarations[0] as ClassDeclaration;
     InterfaceType typeA = classA.element.type;
     FunctionDeclaration function = unit.declarations[1] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     ReturnStatement statement = body.block.statements[1] as ReturnStatement;
     SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeA, variableName.propagatedType);
   }
+
   void test_is_subclass() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  B m() => this;",
         "}",
         "A f(A p) {",
         "  if (p is B) {",
         "    return p.m();",
         "  }",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     FunctionDeclaration function = unit.declarations[2] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     IfStatement ifStatement = body.block.statements[0] as IfStatement;
-    ReturnStatement statement = ((ifStatement.thenStatement as Block)).statements[0] as ReturnStatement;
+    ReturnStatement statement = (ifStatement.thenStatement as Block).statements[0] as ReturnStatement;
     MethodInvocation invocation = statement.expression as MethodInvocation;
     JUnitTestCase.assertNotNull(invocation.methodName.propagatedElement);
   }
+
   void test_is_while() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "A f(var p) {",
         "  while (p is A) {",
         "    return p;",
         "  }",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     ClassDeclaration classA = unit.declarations[0] as ClassDeclaration;
     InterfaceType typeA = classA.element.type;
     FunctionDeclaration function = unit.declarations[1] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     WhileStatement whileStatement = body.block.statements[0] as WhileStatement;
-    ReturnStatement statement = ((whileStatement.body as Block)).statements[0] as ReturnStatement;
+    ReturnStatement statement = (whileStatement.body as Block).statements[0] as ReturnStatement;
     SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeA, variableName.propagatedType);
   }
+
   void test_isNot_conditional() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "A f(var p) {",
         "  return (p is! A) ? null : p;",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     ClassDeclaration classA = unit.declarations[0] as ClassDeclaration;
     InterfaceType typeA = classA.element.type;
     FunctionDeclaration function = unit.declarations[1] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     ReturnStatement statement = body.block.statements[0] as ReturnStatement;
     ConditionalExpression conditional = statement.expression as ConditionalExpression;
     SimpleIdentifier variableName = conditional.elseExpression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeA, variableName.propagatedType);
   }
+
   void test_isNot_if() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "A f(var p) {",
         "  if (p is! A) {",
         "    return null;",
         "  } else {",
         "    return p;",
         "  }",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     ClassDeclaration classA = unit.declarations[0] as ClassDeclaration;
     InterfaceType typeA = classA.element.type;
     FunctionDeclaration function = unit.declarations[1] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     IfStatement ifStatement = body.block.statements[0] as IfStatement;
-    ReturnStatement statement = ((ifStatement.elseStatement as Block)).statements[0] as ReturnStatement;
+    ReturnStatement statement = (ifStatement.elseStatement as Block).statements[0] as ReturnStatement;
     SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeA, variableName.propagatedType);
   }
+
   void test_isNot_if_logicalOr() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "A f(var p) {",
         "  if (p is! A || null == p) {",
         "    return null;",
         "  } else {",
         "    return p;",
         "  }",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     ClassDeclaration classA = unit.declarations[0] as ClassDeclaration;
     InterfaceType typeA = classA.element.type;
     FunctionDeclaration function = unit.declarations[1] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     IfStatement ifStatement = body.block.statements[0] as IfStatement;
-    ReturnStatement statement = ((ifStatement.elseStatement as Block)).statements[0] as ReturnStatement;
+    ReturnStatement statement = (ifStatement.elseStatement as Block).statements[0] as ReturnStatement;
     SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeA, variableName.propagatedType);
   }
+
   void test_isNot_postConditional() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "A f(var p) {",
         "  A a = (p is! A) ? throw null : p;",
         "  return p;",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     ClassDeclaration classA = unit.declarations[0] as ClassDeclaration;
     InterfaceType typeA = classA.element.type;
     FunctionDeclaration function = unit.declarations[1] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     ReturnStatement statement = body.block.statements[1] as ReturnStatement;
     SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeA, variableName.propagatedType);
   }
+
   void test_isNot_postIf() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "A f(var p) {",
         "  if (p is! A) {",
         "    return null;",
         "  }",
         "  return p;",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     ClassDeclaration classA = unit.declarations[0] as ClassDeclaration;
     InterfaceType typeA = classA.element.type;
     FunctionDeclaration function = unit.declarations[1] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     ReturnStatement statement = body.block.statements[1] as ReturnStatement;
     SimpleIdentifier variableName = statement.expression as SimpleIdentifier;
     JUnitTestCase.assertSame(typeA, variableName.propagatedType);
   }
+
   void test_listLiteral_different() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  var v = [0, '1', 2];", "  return v[2];", "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     ReturnStatement statement = body.block.statements[1] as ReturnStatement;
     IndexExpression indexExpression = statement.expression as IndexExpression;
     JUnitTestCase.assertNull(indexExpression.propagatedType);
   }
+
   void test_listLiteral_same() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  var v = [0, 1, 2];", "  return v[2];", "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     ReturnStatement statement = body.block.statements[1] as ReturnStatement;
     IndexExpression indexExpression = statement.expression as IndexExpression;
     JUnitTestCase.assertSame(typeProvider.intType, indexExpression.propagatedType);
   }
+
   void test_mapLiteral_different() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {",
         "  var v = {'0' : 0, 1 : '1', '2' : 2};",
         "  return v;",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     ReturnStatement statement = body.block.statements[1] as ReturnStatement;
     SimpleIdentifier identifier = statement.expression as SimpleIdentifier;
     InterfaceType propagatedType = identifier.propagatedType as InterfaceType;
     JUnitTestCase.assertSame(typeProvider.mapType.element, propagatedType.element);
     List<Type2> typeArguments = propagatedType.typeArguments;
     EngineTestCase.assertLength(2, typeArguments);
     JUnitTestCase.assertSame(typeProvider.dynamicType, typeArguments[0]);
     JUnitTestCase.assertSame(typeProvider.dynamicType, typeArguments[1]);
   }
+
   void test_mapLiteral_same() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {",
         "  var v = {'a' : 0, 'b' : 1, 'c' : 2};",
         "  return v;",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration;
     BlockFunctionBody body = function.functionExpression.body as BlockFunctionBody;
     ReturnStatement statement = body.block.statements[1] as ReturnStatement;
     SimpleIdentifier identifier = statement.expression as SimpleIdentifier;
     InterfaceType propagatedType = identifier.propagatedType as InterfaceType;
     JUnitTestCase.assertSame(typeProvider.mapType.element, propagatedType.element);
     List<Type2> typeArguments = propagatedType.typeArguments;
     EngineTestCase.assertLength(2, typeArguments);
     JUnitTestCase.assertSame(typeProvider.stringType, typeArguments[0]);
     JUnitTestCase.assertSame(typeProvider.intType, typeArguments[1]);
   }
+
   void test_propagatedReturnType_function_hasReturnType_returnsNull() {
     String code = EngineTestCase.createSource(["String f() => null;", "main() {", "  var v = f();", "}"]);
     check_propagatedReturnType(code, typeProvider.dynamicType, typeProvider.stringType);
   }
+
   void test_propagatedReturnType_function_lessSpecificStaticReturnType() {
     String code = EngineTestCase.createSource(["Object f() => 42;", "main() {", "  var v = f();", "}"]);
     check_propagatedReturnType(code, typeProvider.dynamicType, typeProvider.intType);
   }
+
   void test_propagatedReturnType_function_moreSpecificStaticReturnType() {
     String code = EngineTestCase.createSource([
         "int f(v) => (v as num);",
         "main() {",
         "  var v = f(3);",
         "}"]);
     check_propagatedReturnType(code, typeProvider.dynamicType, typeProvider.intType);
   }
+
   void test_propagatedReturnType_function_noReturnTypeName_blockBody_multipleReturns() {
     String code = EngineTestCase.createSource([
         "f() {",
         "  if (true) return 0;",
         "  return 1.0;",
         "}",
         "main() {",
         "  var v = f();",
         "}"]);
     check_propagatedReturnType(code, typeProvider.dynamicType, typeProvider.numType);
   }
+
   void test_propagatedReturnType_function_noReturnTypeName_blockBody_oneReturn() {
     String code = EngineTestCase.createSource([
         "f() {",
         "  var z = 42;",
         "  return z;",
         "}",
         "main() {",
         "  var v = f();",
         "}"]);
     check_propagatedReturnType(code, typeProvider.dynamicType, typeProvider.intType);
   }
+
   void test_propagatedReturnType_function_noReturnTypeName_expressionBody() {
     String code = EngineTestCase.createSource(["f() => 42;", "main() {", "  var v = f();", "}"]);
     check_propagatedReturnType(code, typeProvider.dynamicType, typeProvider.intType);
   }
+
   void test_propagatedReturnType_localFunction() {
     String code = EngineTestCase.createSource(["main() {", "  f() => 42;", "  var v = f();", "}"]);
     check_propagatedReturnType(code, typeProvider.dynamicType, typeProvider.intType);
   }
+
   void test_query() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'dart:html';",
         "",
         "main() {",
         "  var v1 = query('a');",
         "  var v2 = query('A');",
         "  var v3 = query('body:active');",
         "  var v4 = query('button[foo=\"bar\"]');",
         "  var v5 = query('div.class');",
         "  var v6 = query('input#id');",
         "  var v7 = query('select#id');",
         "  // invocation of method",
         "  var m1 = document.query('div');",
         " // unsupported currently",
         "  var b1 = query('noSuchTag');",
         "  var b2 = query('DART_EDITOR_NO_SUCH_TYPE');",
         "  var b3 = query('body div');",
         "  return [v1, v2, v3, v4, v5, v6, v7, m1, b1, b2, b3];",
         "}"]));
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     FunctionDeclaration main = unit.declarations[0] as FunctionDeclaration;
     BlockFunctionBody body = main.functionExpression.body as BlockFunctionBody;
     ReturnStatement statement = body.block.statements[11] as ReturnStatement;
-    NodeList<Expression> elements = ((statement.expression as ListLiteral)).elements;
+    NodeList<Expression> elements = (statement.expression as ListLiteral).elements;
     JUnitTestCase.assertEquals("AnchorElement", elements[0].propagatedType.name);
     JUnitTestCase.assertEquals("AnchorElement", elements[1].propagatedType.name);
     JUnitTestCase.assertEquals("BodyElement", elements[2].propagatedType.name);
     JUnitTestCase.assertEquals("ButtonElement", elements[3].propagatedType.name);
     JUnitTestCase.assertEquals("DivElement", elements[4].propagatedType.name);
     JUnitTestCase.assertEquals("InputElement", elements[5].propagatedType.name);
     JUnitTestCase.assertEquals("SelectElement", elements[6].propagatedType.name);
     JUnitTestCase.assertEquals("DivElement", elements[7].propagatedType.name);
     JUnitTestCase.assertEquals("Element", elements[8].propagatedType.name);
     JUnitTestCase.assertEquals("Element", elements[9].propagatedType.name);
     JUnitTestCase.assertEquals("Element", elements[10].propagatedType.name);
   }
 
   /**
    * @param code the code that assigns the value to the variable "v", no matter how. We check that
    *          "v" has expected static and propagated type.
    */
   void check_propagatedReturnType(String code, Type2 expectedStaticType, Type2 expectedPropagatedType) {
     Source source = addSource(code);
     LibraryElement library = resolve(source);
     assertNoErrors(source);
     verify([source]);
     CompilationUnit unit = resolveCompilationUnit(source, library);
     SimpleIdentifier identifier = EngineTestCase.findNode(unit, code, "v = ", SimpleIdentifier);
     JUnitTestCase.assertSame(expectedStaticType, identifier.staticType);
     JUnitTestCase.assertSame(expectedPropagatedType, identifier.propagatedType);
   }
+
   static dartSuite() {
     _ut.group('TypePropagationTest', () {
       _ut.test('test_Future_then', () {
         final __test = new TypePropagationTest();
         runJUnitTest(__test, __test.test_Future_then);
       });
       _ut.test('test_as', () {
         final __test = new TypePropagationTest();
         runJUnitTest(__test, __test.test_as);
       });
@@ skipping 137 matching lines @@
         final __test = new TypePropagationTest();
         runJUnitTest(__test, __test.test_propagatedReturnType_localFunction);
       });
       _ut.test('test_query', () {
         final __test = new TypePropagationTest();
         runJUnitTest(__test, __test.test_query);
       });
     });
   }
 }
+
 class NonErrorResolverTest extends ResolverTestCase {
   void test_ambiguousExport() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "export 'lib1.dart';",
         "export 'lib2.dart';"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class M {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "class N {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_ambiguousExport_combinators_hide() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "export 'lib1.dart';",
         "export 'lib2.dart' hide B;"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library L1;", "class A {}", "class B {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library L2;", "class B {}", "class C {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_ambiguousExport_combinators_show() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "export 'lib1.dart';",
         "export 'lib2.dart' show C;"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library L1;", "class A {}", "class B {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library L2;", "class B {}", "class C {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
+  void test_ambiguousExport_sameDeclaration() {
+    Source source = addSource(EngineTestCase.createSource(["library L;", "export 'lib.dart';", "export 'lib.dart';"]));
+    addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class N {}"]));
+    resolve(source);
+    assertNoErrors(source);
+    verify([source]);
+  }
+
   void test_argumentDefinitionTestNonParameter_formalParameter() {
     Source source = addSource(EngineTestCase.createSource(["f(var v) {", "  return ?v;", "}"]));
     resolve(source);
     assertErrors(source, [ParserErrorCode.DEPRECATED_ARGUMENT_DEFINITION_TEST]);
     verify([source]);
   }
+
   void test_argumentDefinitionTestNonParameter_namedParameter() {
     Source source = addSource(EngineTestCase.createSource(["f({var v : 0}) {", "  return ?v;", "}"]));
     resolve(source);
     assertErrors(source, [ParserErrorCode.DEPRECATED_ARGUMENT_DEFINITION_TEST]);
     verify([source]);
   }
+
   void test_argumentDefinitionTestNonParameter_optionalParameter() {
     Source source = addSource(EngineTestCase.createSource(["f([var v]) {", "  return ?v;", "}"]));
     resolve(source);
     assertErrors(source, [ParserErrorCode.DEPRECATED_ARGUMENT_DEFINITION_TEST]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_classWithCall_Function() {
     Source source = addSource(EngineTestCase.createSource([
         "  caller(Function callee) {",
         "    callee();",
         "  }",
         "",
         "  class CallMeBack {",
         "    call() => 0;",
         "  }",
         "",
         "  main() {",
         "    caller(new CallMeBack());",
         "  }"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_fieldFormalParameterElement_member() {
     Source source = addSource(EngineTestCase.createSource([
         "class ObjectSink<T> {",
         "  void sink(T object) {",
         "    new TimestampedObject<T>(object);",
         "  }",
         "}",
         "class TimestampedObject<E> {",
         "  E object2;",
         "  TimestampedObject(this.object2);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_invocation_functionParameter_generic() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<K> {",
         "  m(f(K k), K v) {",
         "    f(v);",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_invocation_typedef_generic() {
     Source source = addSource(EngineTestCase.createSource(["typedef A<T>(T p);", "f(A<int> a) {", "  a(1);", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_Object_Function() {
     Source source = addSource(EngineTestCase.createSource([
         "main() {",
         "  process(() {});",
         "}",
         "process(Object x) {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_typedef_local() {
     Source source = addSource(EngineTestCase.createSource([
         "typedef A(int p1, String p2);",
         "A getA() => null;",
         "f() {",
         "  A a = getA();",
         "  a(1, '2');",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_typedef_parameter() {
     Source source = addSource(EngineTestCase.createSource([
         "typedef A(int p1, String p2);",
         "f(A a) {",
         "  a(1, '2');",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_assignmentToFinal_prefixNegate() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  final x = 0;", "  -x;", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_assignmentToFinals_importWithPrefix() {
     Source source = addSource(EngineTestCase.createSource([
         "library lib;",
         "import 'lib1.dart' as foo;",
         "main() {",
         "  foo.x = true;",
         "}"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "bool x = false;"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_breakWithoutLabelInSwitch() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void m(int i) {",
         "    switch (i) {",
         "      case 0:",
         "        break;",
         "    }",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_builtInIdentifierAsType_dynamic() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  dynamic x;", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_caseBlockNotTerminated() {
     Source source = addSource(EngineTestCase.createSource([
         "f(int p) {",
         "  for (int i = 0; i < 10; i++) {",
         "    switch (p) {",
         "      case 0:",
         "        break;",
         "      case 1:",
         "        continue;",
         "      case 2:",
         "        return;",
         "      case 3:",
         "        throw new Object();",
         "      case 4:",
         "      case 5:",
         "        return;",
         "      case 6:",
         "      default:",
         "        return;",
         "    }",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_caseBlockNotTerminated_lastCase() {
     Source source = addSource(EngineTestCase.createSource([
         "f(int p) {",
         "  switch (p) {",
         "    case 0:",
         "      p = p + 1;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_caseExpressionTypeImplementsEquals_int() {
     Source source = addSource(EngineTestCase.createSource([
         "f(int i) {",
         "  switch(i) {",
         "    case(1) : return 1;",
         "    default: return 0;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_caseExpressionTypeImplementsEquals_Object() {
     Source source = addSource(EngineTestCase.createSource([
         "class IntWrapper {",
         "  final int value;",
         "  const IntWrapper(this.value);",
         "}",
         "",
         "f(IntWrapper intWrapper) {",
         "  switch(intWrapper) {",
         "    case(const IntWrapper(1)) : return 1;",
         "    default: return 0;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_caseExpressionTypeImplementsEquals_String() {
     Source source = addSource(EngineTestCase.createSource([
         "f(String s) {",
         "  switch(s) {",
         "    case('1') : return 1;",
         "    default: return 0;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_concreteClassWithAbstractMember() {
     Source source = addSource(EngineTestCase.createSource(["abstract class A {", "  m();", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_conflictingInstanceGetterAndSuperclassMember_instance() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  get v => 0;",
         "}",
         "class B extends A {",
         "  get v => 1;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_conflictingStaticGetterAndInstanceSetter_thisClass() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static get x => 0;",
         "  static set x(int p) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_conflictingStaticSetterAndInstanceMember_thisClass_method() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static x() {}",
         "  static set x(int p) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constConstructorWithNonConstSuper_redirectingFactory() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A();",
         "}",
         "class B implements C {",
         "  const B();",
         "}",
         "class C extends A {",
         "  const factory C() = B;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constConstructorWithNonFinalField_finalInstanceVar() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final int x = 0;", "  const A();", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constConstructorWithNonFinalField_mixin() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  a() {}",
         "}",
         "class B extends Object with A {",
         "  const B();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constConstructorWithNonFinalField_static() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  static int x;", "  const A();", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constConstructorWithNonFinalField_syntheticField() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "  set x(value) {}",
         "  get x {return 0;}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
+  void test_constEval_functionTypeLiteral() {
+    Source source = addSource(EngineTestCase.createSource(["typedef F();", "const C = F;"]));
+    resolve(source);
+    assertNoErrors(source);
+    verify([source]);
+  }
+
   void test_constEval_propertyExtraction_fieldStatic_targetType() {
     addSource2("/math.dart", EngineTestCase.createSource(["library math;", "const PI = 3.14;"]));
     Source source = addSource(EngineTestCase.createSource(["import 'math.dart' as math;", "const C = math.PI;"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constEval_propertyExtraction_methodStatic_targetType() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "  static m() {}",
         "}",
         "const C = A.m;"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constEval_symbol() {
     addSource2("/math.dart", EngineTestCase.createSource(["library math;", "const PI = 3.14;"]));
     Source source = addSource(EngineTestCase.createSource(["const C = #foo;", "foo() {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constEvalTypeBoolNumString_equal() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "}",
         "class B {",
         "  final v;",
         "  const B.a1(bool p) : v = p == true;",
         "  const B.a2(bool p) : v = p == false;",
         "  const B.a3(bool p) : v = p == 0;",
         "  const B.a4(bool p) : v = p == 0.0;",
         "  const B.a5(bool p) : v = p == '';",
         "  const B.b1(int p) : v = p == true;",
         "  const B.b2(int p) : v = p == false;",
         "  const B.b3(int p) : v = p == 0;",
         "  const B.b4(int p) : v = p == 0.0;",
         "  const B.b5(int p) : v = p == '';",
         "  const B.c1(String p) : v = p == true;",
         "  const B.c2(String p) : v = p == false;",
         "  const B.c3(String p) : v = p == 0;",
         "  const B.c4(String p) : v = p == 0.0;",
         "  const B.c5(String p) : v = p == '';",
         "  const B.n1(num p) : v = p == null;",
         "  const B.n2(num p) : v = null == p;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_constEvalTypeBoolNumString_notEqual() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "}",
         "class B {",
         "  final v;",
         "  const B.a1(bool p) : v = p != true;",
         "  const B.a2(bool p) : v = p != false;",
         "  const B.a3(bool p) : v = p != 0;",
         "  const B.a4(bool p) : v = p != 0.0;",
         "  const B.a5(bool p) : v = p != '';",
         "  const B.b1(int p) : v = p != true;",
         "  const B.b2(int p) : v = p != false;",
         "  const B.b3(int p) : v = p != 0;",
         "  const B.b4(int p) : v = p != 0.0;",
         "  const B.b5(int p) : v = p != '';",
         "  const B.c1(String p) : v = p != true;",
         "  const B.c2(String p) : v = p != false;",
         "  const B.c3(String p) : v = p != 0;",
         "  const B.c4(String p) : v = p != 0.0;",
         "  const B.c5(String p) : v = p != '';",
         "  const B.n1(num p) : v = p != null;",
         "  const B.n2(num p) : v = null != p;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constNotInitialized_field() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  static const int x = 0;", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constNotInitialized_local() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  const int x = 0;", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constructorDeclaration_scope_signature() {
     Source source = addSource(EngineTestCase.createSource([
         "const app = 0;",
         "class A {",
         "  A(@app int app) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constWithNonConstantArgument_literals() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A(a, b, c, d);",
         "}",
         "f() { return const A(true, 0, 1.0, '2'); }"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constWithTypeParameters_direct() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<T> {",
         "  static const V = const A<int>();",
         "  const A();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constWithUndefinedConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A.name();",
         "}",
         "f() {",
         "  return const A.name();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_constWithUndefinedConstructorDefault() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "}",
         "f() {",
         "  return const A();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_defaultValueInFunctionTypeAlias() {
     Source source = addSource(EngineTestCase.createSource(["typedef F([x]);"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_defaultValueInFunctionTypedParameter_named() {
     Source source = addSource(EngineTestCase.createSource(["f(g({p})) {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_defaultValueInFunctionTypedParameter_optional() {
     Source source = addSource(EngineTestCase.createSource(["f(g([p])) {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_duplicateDefinition_emptyName() {
     Source source = addSource(EngineTestCase.createSource([
         "Map _globalMap = {",
         "  'a' : () {},",
         "  'b' : () {}",
         "};"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_duplicateDefinition_getter() {
     Source source = addSource(EngineTestCase.createSource(["bool get a => true;"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_dynamicIdentifier() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  var v = dynamic;", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_expectedOneListTypeArgument() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  <int> [];", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_expectedTwoMapTypeArguments() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  <int, int> {};", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_exportOfNonLibrary_libraryDeclared() {
     Source source = addSource(EngineTestCase.createSource(["library L;", "export 'lib1.dart';"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_exportOfNonLibrary_libraryNotDeclared() {
     Source source = addSource(EngineTestCase.createSource(["library L;", "export 'lib1.dart';"]));
     addSource2("/lib1.dart", EngineTestCase.createSource([""]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_extraPositionalArguments_function() {
     Source source = addSource(EngineTestCase.createSource(["f(p1, p2) {}", "main() {", "  f(1, 2);", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_extraPositionalArguments_Function() {
     Source source = addSource(EngineTestCase.createSource(["f(Function a) {", "  a(1, 2);", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_extraPositionalArguments_typedef_local() {
     Source source = addSource(EngineTestCase.createSource([
         "typedef A(p1, p2);",
         "A getA() => null;",
         "f() {",
         "  A a = getA();",
         "  a(1, 2);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_extraPositionalArguments_typedef_parameter() {
     Source source = addSource(EngineTestCase.createSource(["typedef A(p1, p2);", "f(A a) {", "  a(1, 2);", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_fieldInitializedByMultipleInitializers() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int x;",
         "  int y;",
         "  A() : x = 0, y = 0 {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_fieldInitializedInInitializerAndDeclaration_fieldNotFinal() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x = 0;", "  A() : x = 1 {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_fieldInitializedInInitializerAndDeclaration_finalFieldNotSet() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final int x;", "  A() : x = 1 {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_fieldInitializerOutsideConstructor() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x;", "  A(this.x) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_fieldInitializerOutsideConstructor_defaultParameters() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x;", "  A([this.x]) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_fieldInitializerRedirectingConstructor_super() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A() {}",
         "}",
         "class B extends A {",
         "  int x;",
         "  B(this.x) : super();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_finalInitializedInDeclarationAndConstructor_initializer() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final x;", "  A() : x = 1 {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_finalInitializedInDeclarationAndConstructor_initializingFormal() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final x;", "  A(this.x) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_finalNotInitialized_atDeclaration() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final int x = 0;", "  A() {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_finalNotInitialized_fieldFormal() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final int x = 0;", "  A() {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_finalNotInitialized_functionTypedFieldFormal() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final Function x;",
         "  A(int this.x(int p)) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_finalNotInitialized_hasNativeClause_hasConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A native 'something' {",
         "  final int x;",
         "  A() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [ParserErrorCode.NATIVE_CLAUSE_IN_NON_SDK_CODE]);
     verify([source]);
   }
+
   void test_finalNotInitialized_hasNativeClause_noConstructor() {
     Source source = addSource(EngineTestCase.createSource(["class A native 'something' {", "  final int x;", "}"]));
     resolve(source);
     assertErrors(source, [ParserErrorCode.NATIVE_CLAUSE_IN_NON_SDK_CODE]);
     verify([source]);
   }
+
   void test_finalNotInitialized_initializer() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final int x;", "  A() : x = 0 {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_finalNotInitialized_redirectingConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final int x;",
         "  A(this.x);",
         "  A.named() : this (42);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_functionDeclaration_scope_returnType() {
     Source source = addSource(EngineTestCase.createSource(["int f(int) {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_functionDeclaration_scope_signature() {
     Source source = addSource(EngineTestCase.createSource(["const app = 0;", "f(@app int app) {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_functionTypeAlias_scope_returnType() {
     Source source = addSource(EngineTestCase.createSource(["typedef int f(int);"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_functionTypeAlias_scope_signature() {
     Source source = addSource(EngineTestCase.createSource(["const app = 0;", "typedef int f(@app int app);"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_functionWithoutCall() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A implements Function {",
         "}",
         "class B implements A {",
         "  void call() {}",
         "}",
         "class C extends A {",
         "  void call() {}",
         "}",
         "class D extends C {",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_constructorName() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A.named() {}",
         "}",
         "class B {",
         "  var v;",
         "  B() : v = new A.named();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
+  void test_implicitThisReferenceInInitializer_importPrefix() {
+    Source source = addSource(EngineTestCase.createSource([
+        "import 'dart:async' as abstract;",
+        "class A {",
+        "  var v = new abstract.Completer();",
+        "}"]));
+    resolve(source);
+    assertNoErrors(source);
+    verify([source]);
+  }
+
   void test_implicitThisReferenceInInitializer_prefixedIdentifier() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var f;",
         "}",
         "class B {",
         "  var v;",
         "  B(A a) : v = a.f;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_qualifiedMethodInvocation() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  f() {}",
         "}",
         "class B {",
         "  var v;",
         "  B() : v = new A().f();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_qualifiedPropertyAccess() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var f;",
         "}",
         "class B {",
         "  var v;",
         "  B() : v = new A().f;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_staticField_thisClass() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var v;",
         "  A() : v = f;",
         "  static var f;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_staticGetter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var v;",
         "  A() : v = f;",
         "  static get f => 42;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_staticMethod() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var v;",
         "  A() : v = f();",
         "  static f() => 42;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_topLevelField() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var v;",
         "  A() : v = f;",
         "}",
         "var f = 42;"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_topLevelFunction() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var v;",
         "  A() : v = f();",
         "}",
         "f() => 42;"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_topLevelGetter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var v;",
         "  A() : v = f;",
         "}",
         "get f => 42;"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_typeParameter() {
     Source source = addSource(EngineTestCase.createSource(["class A<T> {", "  var v;", "  A(p) : v = (p is T);", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_importDuplicatedLibraryName() {
     Source source = addSource(EngineTestCase.createSource([
         "library test;",
         "import 'lib.dart';",
         "import 'lib.dart';"]));
     addSource2("/lib.dart", "library lib;");
     resolve(source);
     assertErrors(source, [
         HintCode.UNUSED_IMPORT,
         HintCode.UNUSED_IMPORT,
         HintCode.DUPLICATE_IMPORT]);
     verify([source]);
   }
+
   void test_importOfNonLibrary_libraryDeclared() {
     Source source = addSource(EngineTestCase.createSource(["library lib;", "import 'part.dart';", "A a;"]));
     addSource2("/part.dart", EngineTestCase.createSource(["library lib1;", "class A {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_importOfNonLibrary_libraryNotDeclared() {
     Source source = addSource(EngineTestCase.createSource(["library lib;", "import 'part.dart';", "A a;"]));
     addSource2("/part.dart", EngineTestCase.createSource(["class A {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_importPrefixes_withFirstLetterDifference() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "import 'lib1.dart' as math;",
         "import 'lib2.dart' as path;",
         "main() {",
         "  math.test1();",
         "  path.test2();",
         "}"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "test1() {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "test2() {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_inconsistentCaseExpressionTypes() {
     Source source = addSource(EngineTestCase.createSource([
         "f(var p) {",
         "  switch (p) {",
         "    case 1:",
         "      break;",
         "    case 2:",
         "      break;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_inconsistentMethodInheritance_accessors_typeParameter2() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A<E> {",
         "  E get x {return 1;}",
         "}",
         "class B<E> {",
         "  E get x {return 1;}",
         "}",
         "class C<E> extends A<E> implements B<E> {",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_inconsistentMethodInheritance_accessors_typeParameters_diamond() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class F<E> extends B<E> {}",
         "class D<E> extends F<E> {",
         "  external E get g;",
         "}",
         "abstract class C<E> {",
         "  E get g;",
         "}",
         "abstract class B<E> implements C<E> {",
         "  E get g { return null; }",
         "}",
         "class A<E> extends B<E> implements D<E> {",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_inconsistentMethodInheritance_accessors_typeParameters1() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A<E> {",
         "  E get x;",
         "}",
         "abstract class B<E> {",
         "  E get x;",
         "}",
         "class C<E> implements A<E>, B<E> {",
         "  E get x => 1;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_inconsistentMethodInheritance_methods_typeParameter2() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<E> {",
         "  x(E e) {}",
         "}",
         "class B<E> {",
         "  x(E e) {}",
         "}",
         "class C<E> extends A<E> implements B<E> {",
         "  x(E e) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_inconsistentMethodInheritance_methods_typeParameters1() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<E> {",
         "  x(E e) {}",
         "}",
         "class B<E> {",
         "  x(E e) {}",
         "}",
         "class C<E> implements A<E>, B<E> {",
         "  x(E e) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_inconsistentMethodInheritance_simple() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  x();",
         "}",
         "abstract class B {",
         "  x();",
         "}",
         "class C implements A, B {",
         "  x() {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_initializingFormalForNonExistantField() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x;", "  A(this.x) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_instanceAccessToStaticMember_fromComment() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static m() {}",
         "}",
         "/// [A.m]",
         "main() {",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_instanceAccessToStaticMember_topLevel() {
     Source source = addSource(EngineTestCase.createSource(["m() {}", "main() {", "  m();", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_instanceMemberAccessFromStatic_fromComment() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m() {}",
         "  /// [m]",
         "  static foo() {",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_instanceMethodNameCollidesWithSuperclassStatic_field() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib.dart';",
         "class B extends A {",
         "  _m() {}",
         "}"]));
     addSource2("/lib.dart", EngineTestCase.createSource(["library L;", "class A {", "  static var _m;", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_instanceMethodNameCollidesWithSuperclassStatic_method() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib.dart';",
         "class B extends A {",
         "  _m() {}",
         "}"]));
     addSource2("/lib.dart", EngineTestCase.createSource(["library L;", "class A {", "  static _m() {}", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.OVERRIDDING_PRIVATE_MEMBER]);
     verify([source]);
   }
-  void test_invalidAnnotation_constantVariable() {
+
+  void test_invalidAnnotation_constantVariable_field() {
+    Source source = addSource(EngineTestCase.createSource(["@A.C", "class A {", "  static const C = 0;", "}"]));
+    resolve(source);
+    assertNoErrors(source);
+    verify([source]);
+  }
+
+  void test_invalidAnnotation_constantVariable_field_importWithPrefix() {
+    addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class A {", "  static const C = 0;", "}"]));
+    Source source = addSource(EngineTestCase.createSource(["import 'lib.dart' as p;", "@p.A.C", "main() {", "}"]));
+    resolve(source);
+    assertNoErrors(source);
+    verify([source]);
+  }
+
+  void test_invalidAnnotation_constantVariable_topLevel() {
     Source source = addSource(EngineTestCase.createSource(["const C = 0;", "@C", "main() {", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
-  void test_invalidAnnotation_importWithPrefix_constantVariable() {
+
+  void test_invalidAnnotation_constantVariable_topLevel_importWithPrefix() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "const C = 0;"]));
     Source source = addSource(EngineTestCase.createSource(["import 'lib.dart' as p;", "@p.C", "main() {", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
-  void test_invalidAnnotation_importWithPrefix_constConstructor() {
+
+  void test_invalidAnnotation_constConstructor_importWithPrefix() {
+    addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class A {", "  const A(int p);", "}"]));
+    Source source = addSource(EngineTestCase.createSource(["import 'lib.dart' as p;", "@p.A(42)", "main() {", "}"]));
+    resolve(source);
+    assertNoErrors(source);
+    verify([source]);
+  }
+
+  void test_invalidAnnotation_constConstructor_named_importWithPrefix() {
     addSource2("/lib.dart", EngineTestCase.createSource([
         "library lib;",
         "class A {",
         "  const A.named(int p);",
         "}"]));
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib.dart' as p;",
         "@p.A.named(42)",
         "main() {",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidAssignment() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  var x;", "  var y;", "  x = y;", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidAssignment_compoundAssignment() {
     Source source = addSource(EngineTestCase.createSource([
         "class byte {",
         "  int _value;",
         "  byte(this._value);",
         "  byte operator +(int val) {}",
         "}",
         "",
         "void main() {",
         "  byte b = new byte(52);",
         "  b += 3;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidAssignment_defaultValue_named() {
     Source source = addSource(EngineTestCase.createSource(["f({String x: '0'}) {", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidAssignment_defaultValue_optional() {
     Source source = addSource(EngineTestCase.createSource(["f([String x = '0']) {", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidAssignment_toDynamic() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  var g;", "  g = () => 0;", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidFactoryNameNotAClass() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  factory A() {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidMethodOverrideNamedParamType() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m({int a}) {}",
         "}",
         "class B implements A {",
         "  m({int a, int b}) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidOverrideDifferentDefaultValues_named() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m({int p : 0}) {}",
         "}",
         "class B extends A {",
         "  m({int p : 0}) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
+  void test_invalidOverrideDifferentDefaultValues_named_function() {
+    Source source = addSource(EngineTestCase.createSource([
+        "nothing() => 'nothing';",
+        "class A {",
+        "  thing(String a, {orElse : nothing}) {}",
+        "}",
+        "class B extends A {",
+        "  thing(String a, {orElse : nothing}) {}",
+        "}"]));
+    resolve(source);
+    assertNoErrors(source);
+    verify([source]);
+  }
+
   void test_invalidOverrideDifferentDefaultValues_positional() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m([int p = 0]) {}",
         "}",
         "class B extends A {",
         "  m([int p = 0]) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidOverrideDifferentDefaultValues_positional_changedOrder() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m([int a = 0, String b = '0']) {}",
         "}",
         "class B extends A {",
         "  m([int b = 0, String a = '0']) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
+  void test_invalidOverrideDifferentDefaultValues_positional_function() {
+    Source source = addSource(EngineTestCase.createSource([
+        "nothing() => 'nothing';",
+        "class A {",
+        "  thing(String a, [orElse = nothing]) {}",
+        "}",
+        "class B extends A {",
+        "  thing(String a, [orElse = nothing]) {}",
+        "}"]));
+    resolve(source);
+    assertNoErrors(source);
+    verify([source]);
+  }
+
   void test_invalidOverrideNamed_unorderedNamedParameter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m({a, b}) {}",
         "}",
         "class B extends A {",
         "  m({b, a}) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidOverrideRequired_less() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m(a, b) {}",
         "}",
         "class B extends A {",
         "  m(a, [b]) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidOverrideRequired_same() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m(a) {}",
         "}",
         "class B extends A {",
         "  m(a) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidOverrideReturnType_returnType_interface() {
     Source source = addSource2("/test.dart", EngineTestCase.createSource([
         "abstract class A {",
         "  num m();",
         "}",
         "class B implements A {",
         "  int m() { return 1; }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidOverrideReturnType_returnType_interface2() {
     Source source = addSource2("/test.dart", EngineTestCase.createSource([
         "abstract class A {",
         "  num m();",
         "}",
         "abstract class B implements A {",
         "}",
         "class C implements B {",
         "  int m() { return 1; }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidOverrideReturnType_returnType_mixin() {
     Source source = addSource2("/test.dart", EngineTestCase.createSource([
         "class A {",
         "  num m() { return 0; }",
         "}",
         "class B extends Object with A {",
         "  int m() { return 1; }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidOverrideReturnType_returnType_parameterizedTypes() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A<E> {",
         "  List<E> m();",
         "}",
         "class B extends A<dynamic> {",
         "  List<dynamic> m() { return new List<dynamic>(); }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidOverrideReturnType_returnType_sameType() {
     Source source = addSource2("/test.dart", EngineTestCase.createSource([
         "class A {",
         "  int m() { return 0; }",
         "}",
         "class B extends A {",
         "  int m() { return 1; }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidOverrideReturnType_returnType_superclass() {
     Source source = addSource2("/test.dart", EngineTestCase.createSource([
         "class A {",
         "  num m() { return 0; }",
         "}",
         "class B extends A {",
         "  int m() { return 1; }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidOverrideReturnType_returnType_superclass2() {
     Source source = addSource2("/test.dart", EngineTestCase.createSource([
         "class A {",
         "  num m() { return 0; }",
         "}",
         "class B extends A {",
         "}",
         "class C extends B {",
         "  int m() { return 1; }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidOverrideReturnType_returnType_void() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void m() {}",
         "}",
         "class B extends A {",
         "  int m() {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidReferenceToThis_constructor() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A() {", "    var v = this;", "  }", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidReferenceToThis_instanceMethod() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  m() {", "    var v = this;", "  }", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidTypeArgumentForKey() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m() {",
         "    return const <int, int>{};",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidTypeArgumentInConstList() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<E> {",
         "  m() {",
         "    return <E>[];",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invalidTypeArgumentInConstMap() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<E> {",
         "  m() {",
         "    return <String, E>{};",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invocationOfNonFunction_dynamic() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var f;",
         "}",
         "class B extends A {",
         "  g() {",
         "    f();",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invocationOfNonFunction_getter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var g;",
         "}",
         "f() {",
         "  A a;",
         "  a.g();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invocationOfNonFunction_localVariable() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  var g;", "  g();", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invocationOfNonFunction_localVariable_dynamic() {
     Source source = addSource(EngineTestCase.createSource(["f() {}", "main() {", "  var v = f;", "  v();", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invocationOfNonFunction_localVariable_dynamic2() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {}",
         "main() {",
         "  var v = f;",
         "  v = 1;",
         "  v();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invocationOfNonFunction_Object() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  Object v = null;", "  v();", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_listElementTypeNotAssignable() {
     Source source = addSource(EngineTestCase.createSource(["var v1 = <int> [42];", "var v2 = const <int> [42];"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_mapKeyTypeNotAssignable() {
     Source source = addSource(EngineTestCase.createSource(["var v = <String, int > {'a' : 1};"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_memberWithClassName_setter() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  set A(v) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_methodDeclaration_scope_signature() {
     Source source = addSource(EngineTestCase.createSource([
         "const app = 0;",
         "class A {",
         "  foo(@app int app) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_misMatchedGetterAndSetterTypes_instance_sameTypes() {
     Source source = addSource(EngineTestCase.createSource([
         "class C {",
         "  int get x => 0;",
         "  set x(int v) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_misMatchedGetterAndSetterTypes_instance_unspecifiedGetter() {
     Source source = addSource(EngineTestCase.createSource(["class C {", "  get x => 0;", "  set x(String v) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_misMatchedGetterAndSetterTypes_instance_unspecifiedSetter() {
     Source source = addSource(EngineTestCase.createSource(["class C {", "  int get x => 0;", "  set x(v) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_misMatchedGetterAndSetterTypes_topLevel_sameTypes() {
     Source source = addSource(EngineTestCase.createSource(["int get x => 0;", "set x(int v) {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_misMatchedGetterAndSetterTypes_topLevel_unspecifiedGetter() {
     Source source = addSource(EngineTestCase.createSource(["get x => 0;", "set x(String v) {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_misMatchedGetterAndSetterTypes_topLevel_unspecifiedSetter() {
     Source source = addSource(EngineTestCase.createSource(["int get x => 0;", "set x(v) {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_mixedReturnTypes_differentScopes() {
     Source source = addSource(EngineTestCase.createSource([
         "class C {",
         "  m(int x) {",
         "    f(int y) {",
         "      return;",
         "    }",
         "    f(x);",
         "    return 0;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
+  void test_mixedReturnTypes_ignoreImplicit() {
+    Source source = addSource(EngineTestCase.createSource([
+        "f(bool p) {",
+        "  if (p) return 42;",
+        "  // implicit 'return;' is ignored",
+        "}"]));
+    resolve(source);
+    assertNoErrors(source);
+    verify([source]);
+  }
+
+  void test_mixedReturnTypes_ignoreImplicit2() {
+    Source source = addSource(EngineTestCase.createSource([
+        "f(bool p) {",
+        "  if (p) {",
+        "    return 42;",
+        "  } else {",
+        "    return 42;",
+        "  }",
+        "  // implicit 'return;' is ignored",
+        "}"]));
+    resolve(source);
+    assertNoErrors(source);
+    verify([source]);
+  }
+
   void test_mixedReturnTypes_sameKind() {
     Source source = addSource(EngineTestCase.createSource([
         "class C {",
         "  m(int x) {",
         "    if (x < 0) {",
         "      return 1;",
         "    }",
         "    return 0;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_mixinDeclaresConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m() {}",
         "}",
         "class B extends Object with A {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_mixinDeclaresConstructor_factory() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  factory A() {}",
         "}",
         "class B extends Object with A {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_mixinInheritsFromNotObject_classDeclaration_mixTypeAlias() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B = Object with A;",
         "class C extends Object with B {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_mixinInheritsFromNotObject_typedef_mixTypeAlias() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B = Object with A;",
         "class C = Object with B;"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_multipleSuperInitializers_no() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "class B extends A {", "  B() {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_multipleSuperInitializers_single() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  B() : super() {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_newWithAbstractClass_factory() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  factory A() { return new B(); }",
         "}",
         "class B implements A {",
         "  B() {}",
         "}",
         "A f() {",
         "  return new A();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_newWithUndefinedConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A.name() {}",
         "}",
         "f() {",
         "  new A.name();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_newWithUndefinedConstructorDefault() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A() {}", "}", "f() {", "  new A();", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberOne_abstractOverridesConcrete_accessor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int get g => 0;",
         "}",
         "abstract class B extends A {",
         "  int get g;",
         "}",
         "class C extends B {",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberOne_abstractOverridesConcrete_method() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m(p) {}",
         "}",
         "abstract class B extends A {",
         "  m(p);",
         "}",
         "class C extends B {",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberOne_noSuchMethod_accessor() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  int get g;",
         "}",
         "class B extends A {",
         "  noSuchMethod(v) => '';",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberOne_noSuchMethod_method() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  m(p);",
         "}",
         "class B extends A {",
         "  noSuchMethod(v) => '';",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonBoolExpression_functionType() {
     Source source = addSource(EngineTestCase.createSource([
         "bool makeAssertion() => true;",
         "f() {",
         "  assert(makeAssertion);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonBoolExpression_interfaceType() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  assert(true);", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonBoolNegationExpression() {
     Source source = addSource(EngineTestCase.createSource([
         "f(bool pb, pd) {",
         "  !true;",
         "  !false;",
         "  !pb;",
         "  !pd;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstantDefaultValue_function_named() {
     Source source = addSource(EngineTestCase.createSource(["f({x : 2 + 3}) {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstantDefaultValue_function_positional() {
     Source source = addSource(EngineTestCase.createSource(["f([x = 2 + 3]) {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstantDefaultValue_inConstructor_named() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A({x : 2 + 3}) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstantDefaultValue_inConstructor_positional() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A([x = 2 + 3]) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstantDefaultValue_method_named() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  m({x : 2 + 3}) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstantDefaultValue_method_positional() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  m([x = 2 + 3]) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstantValueInInitializer_namedArgument() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final a;",
         "  const A({this.a});",
         "}",
         "class B extends A {",
         "  const B({b}) : super(a: b);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstCaseExpression() {
     Source source = addSource(EngineTestCase.createSource([
         "f(Type t) {",
         "  switch (t) {",
         "    case bool:",
         "    case int:",
         "      return true;",
         "    default:",
         "      return false;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstMapAsExpressionStatement_const() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  const {'a' : 0, 'b' : 1};", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstMapAsExpressionStatement_notExpressionStatement() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  var m = {'a' : 0, 'b' : 1};", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstMapAsExpressionStatement_typeArguments() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  <String, int> {'a' : 0, 'b' : 1};", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstValueInInitializer_binary_bool() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final v;",
         "  const A.a1(bool p) : v = p && true;",
         "  const A.a2(bool p) : v = true && p;",
         "  const A.b1(bool p) : v = p || true;",
         "  const A.b2(bool p) : v = true || p;",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_nonConstValueInInitializer_binary_dynamic() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final v;",
         "  const A.a1(p) : v = p + 5;",
         "  const A.a2(p) : v = 5 + p;",
         "  const A.b1(p) : v = p - 5;",
         "  const A.b2(p) : v = 5 - p;",
         "  const A.c1(p) : v = p * 5;",
         "  const A.c2(p) : v = 5 * p;",
         "  const A.d1(p) : v = p / 5;",
         "  const A.d2(p) : v = 5 / p;",
         "  const A.e1(p) : v = p ~/ 5;",
         "  const A.e2(p) : v = 5 ~/ p;",
         "  const A.f1(p) : v = p > 5;",
         "  const A.f2(p) : v = 5 > p;",
         "  const A.g1(p) : v = p < 5;",
         "  const A.g2(p) : v = 5 < p;",
         "  const A.h1(p) : v = p >= 5;",
         "  const A.h2(p) : v = 5 >= p;",
         "  const A.i1(p) : v = p <= 5;",
         "  const A.i2(p) : v = 5 <= p;",
         "  const A.j1(p) : v = p % 5;",
         "  const A.j2(p) : v = 5 % p;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_nonConstValueInInitializer_binary_int() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final v;",
         "  const A.a1(int p) : v = p ^ 5;",
         "  const A.a2(int p) : v = 5 ^ p;",
         "  const A.b1(int p) : v = p & 5;",
         "  const A.b2(int p) : v = 5 & p;",
         "  const A.c1(int p) : v = p | 5;",
         "  const A.c2(int p) : v = 5 | p;",
         "  const A.d1(int p) : v = p >> 5;",
         "  const A.d2(int p) : v = 5 >> p;",
         "  const A.e1(int p) : v = p << 5;",
         "  const A.e2(int p) : v = 5 << p;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstValueInInitializer_binary_num() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final v;",
         "  const A.a1(num p) : v = p + 5;",
         "  const A.a2(num p) : v = 5 + p;",
         "  const A.b1(num p) : v = p - 5;",
         "  const A.b2(num p) : v = 5 - p;",
         "  const A.c1(num p) : v = p * 5;",
         "  const A.c2(num p) : v = 5 * p;",
         "  const A.d1(num p) : v = p / 5;",
         "  const A.d2(num p) : v = 5 / p;",
         "  const A.e1(num p) : v = p ~/ 5;",
         "  const A.e2(num p) : v = 5 ~/ p;",
         "  const A.f1(num p) : v = p > 5;",
         "  const A.f2(num p) : v = 5 > p;",
         "  const A.g1(num p) : v = p < 5;",
         "  const A.g2(num p) : v = 5 < p;",
         "  const A.h1(num p) : v = p >= 5;",
         "  const A.h2(num p) : v = 5 >= p;",
         "  const A.i1(num p) : v = p <= 5;",
         "  const A.i2(num p) : v = 5 <= p;",
         "  const A.j1(num p) : v = p % 5;",
         "  const A.j2(num p) : v = 5 % p;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstValueInInitializer_field() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final int a;",
         "  const A() : a = 5;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstValueInInitializer_redirecting() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A.named(p);",
         "  const A() : this.named(42);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstValueInInitializer_super() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A(p);",
         "}",
         "class B extends A {",
         "  const B() : super(42);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonConstValueInInitializer_unary() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final v;",
         "  const A.a(bool p) : v = !p;",
         "  const A.b(int p) : v = ~p;",
         "  const A.c(num p) : v = -p;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonGenerativeConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A.named() {}",
         "  factory A() {}",
         "}",
         "class B extends A {",
         "  B() : super.named();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonTypeInCatchClause_isClass() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {",
         "  try {",
         "  } on String catch (e) {",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonTypeInCatchClause_isFunctionTypeAlias() {
     Source source = addSource(EngineTestCase.createSource([
         "typedef F();",
         "f() {",
         "  try {",
         "  } on F catch (e) {",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonTypeInCatchClause_isTypeParameter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<T> {",
         "  f() {",
         "    try {",
         "    } on T catch (e) {",
         "    }",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonTypeInCatchClause_noType() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  try {", "  } catch (e) {", "  }", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonVoidReturnForOperator_no() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  operator []=(a, b) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonVoidReturnForOperator_void() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  void operator []=(a, b) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonVoidReturnForSetter_function_no() {
     Source source = addSource("set x(v) {}");
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonVoidReturnForSetter_function_void() {
     Source source = addSource("void set x(v) {}");
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonVoidReturnForSetter_method_no() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  set x(v) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_nonVoidReturnForSetter_method_void() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  void set x(v) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_null_callMethod() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  null.m();", "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_null_callOperator() {
     Source source = addSource(EngineTestCase.createSource([
         "main() {",
         "  null + 5;",
         "  null == 5;",
         "  null[0];",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_optionalParameterInOperator_required() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  operator +(p) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_prefixCollidesWithTopLevelMembers() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class A {}"]));
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib.dart' as p;",
         "typedef P();",
         "p2() {}",
         "var p3;",
         "class p4 {}",
         "p.A a;"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_propagateTypeArgs_intoBounds() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A<E> {}",
         "abstract class B<F> implements A<F>{}",
         "abstract class C<G, H extends A<G>> {}",
         "class D<I> extends C<I, B<I>> {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_propagateTypeArgs_intoSupertype() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<T> {",
         "  A(T p);",
         "  A.named(T p);",
         "}",
         "class B<S> extends A<S> {",
         "  B(S p) : super(p);",
         "  B.named(S p) : super.named(p);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_proxy_annotation_prefixed() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
-        "import 'meta.dart';",
         "@proxy",
         "class A {}",
         "f(A a) {",
         "  a.m();",
         "  var x = a.g;",
         "  a.s = 1;",
         "  var y = a + a;",
         "  a++;",
         "  ++a;",
         "}"]));
-    addSource2("/meta.dart", EngineTestCase.createSource([
-        "library meta;",
-        "const proxy = const _Proxy();",
-        "class _Proxy { const _Proxy(); }"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_proxy_annotation_prefixed2() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
-        "import 'meta.dart';",
         "@proxy",
         "class A {}",
         "class B {",
         "  f(A a) {",
         "    a.m();",
         "    var x = a.g;",
         "    a.s = 1;",
         "    var y = a + a;",
         "    a++;",
         "    ++a;",
         "  }",
         "}"]));
-    addSource2("/meta.dart", EngineTestCase.createSource([
-        "library meta;",
-        "const proxy = const _Proxy();",
-        "class _Proxy { const _Proxy(); }"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_proxy_annotation_prefixed3() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
-        "import 'meta.dart';",
         "class B {",
         "  f(A a) {",
         "    a.m();",
         "    var x = a.g;",
         "    a.s = 1;",
         "    var y = a + a;",
         "    a++;",
         "    ++a;",
         "  }",
         "}",
         "@proxy",
         "class A {}"]));
-    addSource2("/meta.dart", EngineTestCase.createSource([
-        "library meta;",
-        "const proxy = const _Proxy();",
-        "class _Proxy { const _Proxy(); }"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_proxy_annotation_simple() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
-        "import 'meta.dart';",
         "@proxy",
         "class B {",
         "  m() {",
         "    n();",
         "    var x = g;",
         "    s = 1;",
         "    var y = this + this;",
         "  }",
         "}"]));
-    addSource2("/meta.dart", EngineTestCase.createSource([
-        "library meta;",
-        "const proxy = const _Proxy();",
-        "class _Proxy { const _Proxy(); }"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_recursiveConstructorRedirect() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A.a() : this.b();",
         "  A.b() : this.c();",
         "  A.c() {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_recursiveFactoryRedirect() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  factory A() = B;",
         "}",
         "class B implements A {",
         "  factory B() = C;",
         "}",
         "class C implements B {",
         "  factory C() {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_redirectToInvalidFunctionType() {
     Source source = addSource(EngineTestCase.createSource([
         "class A implements B {",
         "  A(int p) {}",
         "}",
         "class B {",
         "  factory B(int p) = A;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_redirectToInvalidReturnType() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A() {}",
         "}",
         "class B extends A {",
         "  factory B() = A;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_redirectToNonConstConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A.a();",
         "  const factory A.b() = A.a;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_referenceToDeclaredVariableInInitializer_constructorName() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A.x() {}",
         "}",
         "f() {",
         "  var x = new A.x();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_referenceToDeclaredVariableInInitializer_methodName() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  x() {}",
         "}",
         "f(A a) {",
         "  var x = a.x();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_referenceToDeclaredVariableInInitializer_propertyName() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var x;",
         "}",
         "f(A a) {",
         "  var x = a.x;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_rethrowOutsideCatch() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void m() {",
         "    try {} catch (e) {rethrow;}",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_returnInGenerativeConstructor() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A() { return; }", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_returnOfInvalidType_dynamic() {
     Source source = addSource(EngineTestCase.createSource([
         "class TypeError {}",
         "class A {",
         "  static void testLogicalOp() {",
         "    testOr(a, b, onTypeError) {",
         "      try {",
         "        return a || b;",
         "      } on TypeError catch (t) {",
         "        return onTypeError;",
         "      }",
         "    }",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_returnOfInvalidType_dynamicAsTypeArgument() {
     Source source = addSource(EngineTestCase.createSource([
         "class I<T> {",
         "  factory I() => new A<T>();",
         "}",
         "class A<T> implements I {",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_returnOfInvalidType_subtype() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {}",
         "A f(B b) { return b; }"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_returnOfInvalidType_supertype() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {}",
         "B f(A a) { return a; }"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_returnOfInvalidType_void() {
     Source source = addSource(EngineTestCase.createSource([
         "void f1() {}",
         "void f2() { return; }",
         "void f3() { return null; }",
         "void f4() { return g1(); }",
         "void f5() { return g2(); }",
         "g1() {}",
         "void g2() {}",
         ""]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_returnWithoutValue_noReturnType() {
     Source source = addSource(EngineTestCase.createSource(["f() { return; }"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_returnWithoutValue_void() {
     Source source = addSource(EngineTestCase.createSource(["void f() { return; }"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_reversedTypeArguments() {
     Source source = addSource(EngineTestCase.createSource([
         "class Codec<S1, T1> {",
         "  Codec<T1, S1> get inverted => new _InvertedCodec<T1, S1>(this);",
         "}",
         "class _InvertedCodec<T2, S2> extends Codec<T2, S2> {",
         "  _InvertedCodec(Codec<S2, T2> codec);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_staticAccessToInstanceMember_annotation() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A.name();",
         "}",
         "@A.name()",
         "main() {",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_staticAccessToInstanceMember_method() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static m() {}",
         "}",
         "main() {",
         "  A.m;",
         "  A.m();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_staticAccessToInstanceMember_propertyAccess_field() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static var f;",
         "}",
         "main() {",
         "  A.f;",
         "  A.f = 1;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_staticAccessToInstanceMember_propertyAccess_propertyAccessor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static get f => 42;",
         "  static set f(x) {}",
         "}",
         "main() {",
         "  A.f;",
         "  A.f = 1;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_superInInvalidContext() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m() {}",
         "}",
         "class B extends A {",
         "  B() {",
         "    var v = super.m();",
         "  }",
         "  n() {",
         "    var v = super.m();",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typeAliasCannotReferenceItself_returnClass_withTypeAlias() {
     Source source = addSource(EngineTestCase.createSource(["typedef B A();", "class B {", "  A a;", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_const() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {}",
         "class G<E extends A> {",
         "  const G();",
         "}",
         "f() { return const G<B>(); }"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_new() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {}",
         "class G<E extends A> {}",
         "f() { return new G<B>(); }"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_typeArgumentList_0() {
     Source source = addSource(EngineTestCase.createSource(["abstract class A<T extends A>{}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_typeArgumentList_1() {
     Source source = addSource(EngineTestCase.createSource(["abstract class A<T extends A<A>>{}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_typeArgumentList_20() {
     Source source = addSource(EngineTestCase.createSource(["abstract class A<T extends A<A<A<A<A<A<A<A<A<A<A<A<A<A<A<A<A<A<A<A<A>>>>>>>>>>>>>>>>>>>>>{}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_booleanAnd_useInRight() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p) {",
         "  p is String && p.length != 0;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_booleanAnd_useInRight_accessedInClosureRight_noAssignment() {
     Source source = addSource(EngineTestCase.createSource([
         "callMe(f()) { f(); }",
         "main(Object p) {",
         "  (p is String) && callMe(() { p.length; });",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
+  void test_typePromotion_conditional_issue14655() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class A {}",
+        "class B extends A {}",
+        "class C extends B {",
+        "  mc() {}",
+        "}",
+        "print(_) {}",
+        "main(A p) {",
+        "  (p is C) && (print(() => p) && (p is B)) ? p.mc() : p = null;",
+        "}"]));
+    resolve(source);
+    assertNoErrors(source);
+    verify([source]);
+  }
+
   void test_typePromotion_conditional_useInThen() {
     Source source = addSource(EngineTestCase.createSource(["main(Object p) {", "  p is String ? p.length : 0;", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_conditional_useInThen_accessedInClosure_noAssignment() {
     Source source = addSource(EngineTestCase.createSource([
         "callMe(f()) { f(); }",
         "main(Object p) {",
         "  p is String ? callMe(() { p.length; }) : 0;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_functionType_arg_ignoreIfNotMoreSpecific() {
     Source source = addSource(EngineTestCase.createSource([
         "typedef FuncB(B b);",
         "typedef FuncA(A a);",
         "class A {}",
         "class B {}",
         "main(FuncA f) {",
         "  if (f is FuncB) {",
         "    f(new A());",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_functionType_return_ignoreIfNotMoreSpecific() {
     Source source = addSource(EngineTestCase.createSource([
+        "class A {}",
+        "typedef FuncAtoDyn(A a);",
         "typedef FuncDynToDyn(x);",
-        "typedef void FuncDynToVoid(x);",
-        "class A {}",
-        "main(FuncDynToDyn f) {",
-        "  if (f is FuncDynToVoid) {",
-        "    A a = f(null);",
+        "main(FuncAtoDyn f) {",
+        "  if (f is FuncDynToDyn) {",
+        "    A a = f(new A());",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_functionType_return_voidToDynamic() {
     Source source = addSource(EngineTestCase.createSource([
         "typedef FuncDynToDyn(x);",
         "typedef void FuncDynToVoid(x);",
         "class A {}",
         "main(FuncDynToVoid f) {",
         "  if (f is FuncDynToDyn) {",
         "    A a = f(null);",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_if_accessedInClosure_noAssignment() {
     Source source = addSource(EngineTestCase.createSource([
         "callMe(f()) { f(); }",
         "main(Object p) {",
         "  if (p is String) {",
         "    callMe(() {",
         "      p.length;",
         "    });",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_if_extends_moreSpecific() {
     Source source = addSource(EngineTestCase.createSource([
         "class V {}",
         "class VP extends V {}",
         "class A<T> {}",
         "class B<S> extends A<S> {",
         "  var b;",
         "}",
         "",
         "main(A<V> p) {",
         "  if (p is B<VP>) {",
         "    p.b;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_if_hasAssignment_outsideAfter() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p) {",
         "  if (p is String) {",
         "    p.length;",
         "  }",
         "  p = 0;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_if_hasAssignment_outsideBefore() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p, Object p2) {",
         "  p = p2;",
         "  if (p is String) {",
         "    p.length;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_if_implements_moreSpecific() {
     Source source = addSource(EngineTestCase.createSource([
         "class V {}",
         "class VP extends V {}",
         "class A<T> {}",
         "class B<S> implements A<S> {",
         "  var b;",
         "}",
         "",
         "main(A<V> p) {",
         "  if (p is B<VP>) {",
         "    p.b;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_if_inClosure_assignedAfter_inSameFunction() {
     Source source = addSource(EngineTestCase.createSource([
         "main() {",
         "  f(Object p) {",
         "    if (p is String) {",
         "      p.length;",
         "    }",
         "    p = 0;",
         "  };",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_if_is_and_left() {
     Source source = addSource(EngineTestCase.createSource([
         "bool tt() => true;",
         "main(Object p) {",
         "  if (p is String && tt()) {",
         "    p.length;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_if_is_and_right() {
     Source source = addSource(EngineTestCase.createSource([
         "bool tt() => true;",
         "main(Object p) {",
         "  if (tt() && p is String) {",
         "    p.length;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_if_is_and_subThenSuper() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var a;",
         "}",
         "class B extends A {",
         "  var b;",
         "}",
         "main(Object p) {",
         "  if (p is B && p is A) {",
         "    p.a;",
         "    p.b;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_if_is_parenthesized() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p) {",
         "  if ((p is String)) {",
         "    p.length;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typePromotion_if_is_single() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p) {",
         "  if (p is String) {",
         "    p.length;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
+  void test_typePromotion_parentheses() {
+    Source source = addSource(EngineTestCase.createSource([
+        "main(Object p) {",
+        "  (p is String) ? p.length : 0;",
+        "  (p) is String ? p.length : 0;",
+        "  ((p)) is String ? p.length : 0;",
+        "  ((p) is String) ? p.length : 0;",
+        "}"]));
+    resolve(source);
+    assertNoErrors(source);
+    verify([source]);
+  }
+
   void test_typeType_class() {
     Source source = addSource(EngineTestCase.createSource(["class C {}", "f(Type t) {}", "main() {", "  f(C);", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typeType_class_prefixed() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class C {}"]));
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib.dart' as p;",
         "f(Type t) {}",
         "main() {",
         "  f(p.C);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typeType_functionTypeAlias() {
     Source source = addSource(EngineTestCase.createSource([
         "typedef F();",
         "f(Type t) {}",
         "main() {",
         "  f(F);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_typeType_functionTypeAlias_prefixed() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "typedef F();"]));
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib.dart' as p;",
         "f(Type t) {}",
         "main() {",
         "  f(p.F);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_undefinedConstructorInInitializer_explicit_named() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A.named() {}",
         "}",
         "class B extends A {",
         "  B() : super.named();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_undefinedConstructorInInitializer_explicit_unnamed() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A() {}",
         "}",
         "class B extends A {",
         "  B() : super();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_undefinedConstructorInInitializer_hasOptionalParameters() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A([p]) {}",
         "}",
         "class B extends A {",
         "  B();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_undefinedConstructorInInitializer_implicit() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A() {}",
         "}",
         "class B extends A {",
         "  B();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_undefinedConstructorInInitializer_implicit_typeAlias() {
     Source source = addSource(EngineTestCase.createSource([
         "class M {}",
         "class A = Object with M;",
         "class B extends A {",
         "  B();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_undefinedConstructorInInitializer_redirecting() {
     Source source = addSource(EngineTestCase.createSource([
         "class Foo {",
         "  Foo.ctor();",
         "}",
         "class Bar extends Foo {",
         "  Bar() : this.ctor();",
         "  Bar.ctor() : super.ctor();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_undefinedGetter_typeSubstitution() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<E> {",
         "  E element;",
         "}",
         "class B extends A<List> {",
         "  m() {",
         "    element.last;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_undefinedIdentifier_hide() {
     Source source = addSource(EngineTestCase.createSource(["library L;", "export 'lib1.dart' hide a;"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_undefinedIdentifier_show() {
     Source source = addSource(EngineTestCase.createSource(["library L;", "export 'lib1.dart' show a;"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_undefinedMethod_functionExpression_callMethod() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  (() => null).call();", "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_undefinedMethod_functionExpression_directCall() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  (() => null)();", "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_undefinedOperator_index() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  operator [](a) {}",
         "  operator []=(a, b) {}",
         "}",
         "f(A a) {",
         "  a[0];",
         "  a[0] = 1;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_undefinedOperator_tilde() {
     Source source = addSource(EngineTestCase.createSource(["const A = 3;", "const B = ~((1 << A) - 1);"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_undefinedSetter_importWithPrefix() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "set y(int value) {}"]));
     Source source = addSource(EngineTestCase.createSource(["import 'lib.dart' as x;", "main() {", "  x.y = 0;", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_undefinedSuperMethod_field() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var m;",
         "}",
         "class B extends A {",
         "  f() {",
         "    super.m();",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_undefinedSuperMethod_method() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m() {}",
         "}",
         "class B extends A {",
         "  f() {",
         "    super.m();",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_unqualifiedReferenceToNonLocalStaticMember_fromComment_new() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A() {}",
         "  A.named() {}",
         "}",
         "/// [new A] or [new A.named]",
         "main() {",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_wrongNumberOfParametersForOperator_index() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  operator []=(a, b) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_wrongNumberOfParametersForOperator_minus() {
     check_wrongNumberOfParametersForOperator("-", "");
     check_wrongNumberOfParametersForOperator("-", "a");
   }
+
   void test_wrongNumberOfParametersForOperator1() {
     check_wrongNumberOfParametersForOperator1("<");
     check_wrongNumberOfParametersForOperator1(">");
     check_wrongNumberOfParametersForOperator1("<=");
     check_wrongNumberOfParametersForOperator1(">=");
     check_wrongNumberOfParametersForOperator1("+");
     check_wrongNumberOfParametersForOperator1("/");
     check_wrongNumberOfParametersForOperator1("~/");
     check_wrongNumberOfParametersForOperator1("*");
     check_wrongNumberOfParametersForOperator1("%");
     check_wrongNumberOfParametersForOperator1("|");
     check_wrongNumberOfParametersForOperator1("^");
     check_wrongNumberOfParametersForOperator1("&");
     check_wrongNumberOfParametersForOperator1("<<");
     check_wrongNumberOfParametersForOperator1(">>");
     check_wrongNumberOfParametersForOperator1("[]");
   }
+
   void test_wrongNumberOfParametersForSetter() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  set x(a) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void check_wrongNumberOfParametersForOperator(String name, String parameters) {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  operator ${name}(${parameters}) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
     reset();
   }
+
   void check_wrongNumberOfParametersForOperator1(String name) {
     check_wrongNumberOfParametersForOperator(name, "a");
   }
+
   static dartSuite() {
     _ut.group('NonErrorResolverTest', () {
       _ut.test('test_ambiguousExport', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_ambiguousExport);
       });
       _ut.test('test_ambiguousExport_combinators_hide', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_ambiguousExport_combinators_hide);
       });
       _ut.test('test_ambiguousExport_combinators_show', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_ambiguousExport_combinators_show);
       });
+      _ut.test('test_ambiguousExport_sameDeclaration', () {
+        final __test = new NonErrorResolverTest();
+        runJUnitTest(__test, __test.test_ambiguousExport_sameDeclaration);
+      });
       _ut.test('test_argumentDefinitionTestNonParameter_formalParameter', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_argumentDefinitionTestNonParameter_formalParameter);
       });
       _ut.test('test_argumentDefinitionTestNonParameter_namedParameter', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_argumentDefinitionTestNonParameter_namedParameter);
       });
       _ut.test('test_argumentDefinitionTestNonParameter_optionalParameter', () {
         final __test = new NonErrorResolverTest();
@@ skipping 100 matching lines @@
         runJUnitTest(__test, __test.test_constConstructorWithNonFinalField_syntheticField);
       });
       _ut.test('test_constEvalTypeBoolNumString_equal', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_constEvalTypeBoolNumString_equal);
       });
       _ut.test('test_constEvalTypeBoolNumString_notEqual', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_constEvalTypeBoolNumString_notEqual);
       });
+      _ut.test('test_constEval_functionTypeLiteral', () {
+        final __test = new NonErrorResolverTest();
+        runJUnitTest(__test, __test.test_constEval_functionTypeLiteral);
+      });
       _ut.test('test_constEval_propertyExtraction_fieldStatic_targetType', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_constEval_propertyExtraction_fieldStatic_targetType);
       });
       _ut.test('test_constEval_propertyExtraction_methodStatic_targetType', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_constEval_propertyExtraction_methodStatic_targetType);
       });
       _ut.test('test_constEval_symbol', () {
         final __test = new NonErrorResolverTest();
@@ skipping 160 matching lines @@
         runJUnitTest(__test, __test.test_functionTypeAlias_scope_signature);
       });
       _ut.test('test_functionWithoutCall', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_functionWithoutCall);
       });
       _ut.test('test_implicitThisReferenceInInitializer_constructorName', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_implicitThisReferenceInInitializer_constructorName);
       });
+      _ut.test('test_implicitThisReferenceInInitializer_importPrefix', () {
+        final __test = new NonErrorResolverTest();
+        runJUnitTest(__test, __test.test_implicitThisReferenceInInitializer_importPrefix);
+      });
       _ut.test('test_implicitThisReferenceInInitializer_prefixedIdentifier', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_implicitThisReferenceInInitializer_prefixedIdentifier);
       });
       _ut.test('test_implicitThisReferenceInInitializer_qualifiedMethodInvocation', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_implicitThisReferenceInInitializer_qualifiedMethodInvocation);
       });
       _ut.test('test_implicitThisReferenceInInitializer_qualifiedPropertyAccess', () {
         final __test = new NonErrorResolverTest();
@@ skipping 88 matching lines @@
         runJUnitTest(__test, __test.test_instanceMemberAccessFromStatic_fromComment);
       });
       _ut.test('test_instanceMethodNameCollidesWithSuperclassStatic_field', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_instanceMethodNameCollidesWithSuperclassStatic_field);
       });
       _ut.test('test_instanceMethodNameCollidesWithSuperclassStatic_method', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_instanceMethodNameCollidesWithSuperclassStatic_method);
       });
-      _ut.test('test_invalidAnnotation_constantVariable', () {
+      _ut.test('test_invalidAnnotation_constConstructor_importWithPrefix', () {
         final __test = new NonErrorResolverTest();
-        runJUnitTest(__test, __test.test_invalidAnnotation_constantVariable);
+        runJUnitTest(__test, __test.test_invalidAnnotation_constConstructor_importWithPrefix);
       });
-      _ut.test('test_invalidAnnotation_importWithPrefix_constConstructor', () {
+      _ut.test('test_invalidAnnotation_constConstructor_named_importWithPrefix', () {
         final __test = new NonErrorResolverTest();
-        runJUnitTest(__test, __test.test_invalidAnnotation_importWithPrefix_constConstructor);
+        runJUnitTest(__test, __test.test_invalidAnnotation_constConstructor_named_importWithPrefix);
       });
-      _ut.test('test_invalidAnnotation_importWithPrefix_constantVariable', () {
+      _ut.test('test_invalidAnnotation_constantVariable_field', () {
         final __test = new NonErrorResolverTest();
-        runJUnitTest(__test, __test.test_invalidAnnotation_importWithPrefix_constantVariable);
+        runJUnitTest(__test, __test.test_invalidAnnotation_constantVariable_field);
+      });
+      _ut.test('test_invalidAnnotation_constantVariable_field_importWithPrefix', () {
+        final __test = new NonErrorResolverTest();
+        runJUnitTest(__test, __test.test_invalidAnnotation_constantVariable_field_importWithPrefix);
+      });
+      _ut.test('test_invalidAnnotation_constantVariable_topLevel', () {
+        final __test = new NonErrorResolverTest();
+        runJUnitTest(__test, __test.test_invalidAnnotation_constantVariable_topLevel);
+      });
+      _ut.test('test_invalidAnnotation_constantVariable_topLevel_importWithPrefix', () {
+        final __test = new NonErrorResolverTest();
+        runJUnitTest(__test, __test.test_invalidAnnotation_constantVariable_topLevel_importWithPrefix);
       });
       _ut.test('test_invalidAssignment', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_invalidAssignment);
       });
       _ut.test('test_invalidAssignment_compoundAssignment', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_invalidAssignment_compoundAssignment);
       });
       _ut.test('test_invalidAssignment_defaultValue_named', () {
@@ skipping 13 matching lines @@
         runJUnitTest(__test, __test.test_invalidFactoryNameNotAClass);
       });
       _ut.test('test_invalidMethodOverrideNamedParamType', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_invalidMethodOverrideNamedParamType);
       });
       _ut.test('test_invalidOverrideDifferentDefaultValues_named', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_invalidOverrideDifferentDefaultValues_named);
       });
+      _ut.test('test_invalidOverrideDifferentDefaultValues_named_function', () {
+        final __test = new NonErrorResolverTest();
+        runJUnitTest(__test, __test.test_invalidOverrideDifferentDefaultValues_named_function);
+      });
       _ut.test('test_invalidOverrideDifferentDefaultValues_positional', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_invalidOverrideDifferentDefaultValues_positional);
       });
       _ut.test('test_invalidOverrideDifferentDefaultValues_positional_changedOrder', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_invalidOverrideDifferentDefaultValues_positional_changedOrder);
       });
+      _ut.test('test_invalidOverrideDifferentDefaultValues_positional_function', () {
+        final __test = new NonErrorResolverTest();
+        runJUnitTest(__test, __test.test_invalidOverrideDifferentDefaultValues_positional_function);
+      });
       _ut.test('test_invalidOverrideNamed_unorderedNamedParameter', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_invalidOverrideNamed_unorderedNamedParameter);
       });
       _ut.test('test_invalidOverrideRequired_less', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_invalidOverrideRequired_less);
       });
       _ut.test('test_invalidOverrideRequired_same', () {
         final __test = new NonErrorResolverTest();
@@ skipping 112 matching lines @@
         runJUnitTest(__test, __test.test_misMatchedGetterAndSetterTypes_topLevel_unspecifiedGetter);
       });
       _ut.test('test_misMatchedGetterAndSetterTypes_topLevel_unspecifiedSetter', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_misMatchedGetterAndSetterTypes_topLevel_unspecifiedSetter);
       });
       _ut.test('test_mixedReturnTypes_differentScopes', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_mixedReturnTypes_differentScopes);
       });
+      _ut.test('test_mixedReturnTypes_ignoreImplicit', () {
+        final __test = new NonErrorResolverTest();
+        runJUnitTest(__test, __test.test_mixedReturnTypes_ignoreImplicit);
+      });
+      _ut.test('test_mixedReturnTypes_ignoreImplicit2', () {
+        final __test = new NonErrorResolverTest();
+        runJUnitTest(__test, __test.test_mixedReturnTypes_ignoreImplicit2);
+      });
       _ut.test('test_mixedReturnTypes_sameKind', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_mixedReturnTypes_sameKind);
       });
       _ut.test('test_mixinDeclaresConstructor', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_mixinDeclaresConstructor);
       });
       _ut.test('test_mixinDeclaresConstructor_factory', () {
         final __test = new NonErrorResolverTest();
@@ skipping 332 matching lines @@
         runJUnitTest(__test, __test.test_typeArgumentNotMatchingBounds_typeArgumentList_20);
       });
       _ut.test('test_typePromotion_booleanAnd_useInRight', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_typePromotion_booleanAnd_useInRight);
       });
       _ut.test('test_typePromotion_booleanAnd_useInRight_accessedInClosureRight_noAssignment', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_typePromotion_booleanAnd_useInRight_accessedInClosureRight_noAssignment);
       });
+      _ut.test('test_typePromotion_conditional_issue14655', () {
+        final __test = new NonErrorResolverTest();
+        runJUnitTest(__test, __test.test_typePromotion_conditional_issue14655);
+      });
       _ut.test('test_typePromotion_conditional_useInThen', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_typePromotion_conditional_useInThen);
       });
       _ut.test('test_typePromotion_conditional_useInThen_accessedInClosure_noAssignment', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_typePromotion_conditional_useInThen_accessedInClosure_noAssignment);
       });
       _ut.test('test_typePromotion_functionType_arg_ignoreIfNotMoreSpecific', () {
         final __test = new NonErrorResolverTest();
@@ skipping 44 matching lines @@
         runJUnitTest(__test, __test.test_typePromotion_if_is_and_subThenSuper);
       });
       _ut.test('test_typePromotion_if_is_parenthesized', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_typePromotion_if_is_parenthesized);
       });
       _ut.test('test_typePromotion_if_is_single', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_typePromotion_if_is_single);
       });
+      _ut.test('test_typePromotion_parentheses', () {
+        final __test = new NonErrorResolverTest();
+        runJUnitTest(__test, __test.test_typePromotion_parentheses);
+      });
       _ut.test('test_typeType_class', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_typeType_class);
       });
       _ut.test('test_typeType_class_prefixed', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_typeType_class_prefixed);
       });
       _ut.test('test_typeType_functionTypeAlias', () {
         final __test = new NonErrorResolverTest();
@@ skipping 83 matching lines @@
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_wrongNumberOfParametersForOperator_minus);
       });
       _ut.test('test_wrongNumberOfParametersForSetter', () {
         final __test = new NonErrorResolverTest();
         runJUnitTest(__test, __test.test_wrongNumberOfParametersForSetter);
       });
     });
   }
 }
+
 class LibraryTest extends EngineTestCase {
-
   /**
    * The error listener to which all errors will be reported.
    */
   GatheringErrorListener _errorListener;
 
   /**
    * The source factory used to create libraries.
    */
   SourceFactory _sourceFactory;
 
   /**
    * The analysis context to pass in to all libraries created by the tests.
    */
   AnalysisContextImpl _analysisContext;
 
   /**
    * The library used by the tests.
    */
   Library _library5;
+
   void setUp() {
     _sourceFactory = new SourceFactory.con2([new FileUriResolver()]);
     _analysisContext = new AnalysisContextImpl();
     _analysisContext.sourceFactory = _sourceFactory;
     _errorListener = new GatheringErrorListener();
     _library5 = library("/lib.dart");
   }
+
   void test_getExplicitlyImportsCore() {
     JUnitTestCase.assertFalse(_library5.explicitlyImportsCore);
     _errorListener.assertNoErrors();
   }
+
   void test_getExports() {
     EngineTestCase.assertLength(0, _library5.exports);
     _errorListener.assertNoErrors();
   }
+
   void test_getImports() {
     EngineTestCase.assertLength(0, _library5.imports);
     _errorListener.assertNoErrors();
   }
+
   void test_getImportsAndExports() {
     _library5.importedLibraries = <Library> [library("/imported.dart")];
     _library5.exportedLibraries = <Library> [library("/exported.dart")];
     EngineTestCase.assertLength(2, _library5.importsAndExports);
     _errorListener.assertNoErrors();
   }
+
   void test_getLibraryScope() {
     LibraryElementImpl element = new LibraryElementImpl(_analysisContext, ASTFactory.libraryIdentifier2(["lib"]));
     element.definingCompilationUnit = new CompilationUnitElementImpl("lib.dart");
     _library5.libraryElement = element;
     JUnitTestCase.assertNotNull(_library5.libraryScope);
     _errorListener.assertNoErrors();
   }
+
   void test_getLibrarySource() {
     JUnitTestCase.assertNotNull(_library5.librarySource);
   }
+
   void test_setExplicitlyImportsCore() {
     _library5.explicitlyImportsCore = true;
     JUnitTestCase.assertTrue(_library5.explicitlyImportsCore);
     _errorListener.assertNoErrors();
   }
+
   void test_setExportedLibraries() {
     Library exportLibrary = library("/exported.dart");
     _library5.exportedLibraries = <Library> [exportLibrary];
     List<Library> exports = _library5.exports;
     EngineTestCase.assertLength(1, exports);
     JUnitTestCase.assertSame(exportLibrary, exports[0]);
     _errorListener.assertNoErrors();
   }
+
   void test_setImportedLibraries() {
     Library importLibrary = library("/imported.dart");
     _library5.importedLibraries = <Library> [importLibrary];
     List<Library> imports = _library5.imports;
     EngineTestCase.assertLength(1, imports);
     JUnitTestCase.assertSame(importLibrary, imports[0]);
     _errorListener.assertNoErrors();
   }
+
   void test_setLibraryElement() {
     LibraryElementImpl element = new LibraryElementImpl(_analysisContext, ASTFactory.libraryIdentifier2(["lib"]));
     _library5.libraryElement = element;
     JUnitTestCase.assertSame(element, _library5.libraryElement);
   }
+
   Library library(String definingCompilationUnitPath) => new Library(_analysisContext, _errorListener, new FileBasedSource.con1(_sourceFactory.contentCache, FileUtilities2.createFile(definingCompilationUnitPath)));
+
   static dartSuite() {
     _ut.group('LibraryTest', () {
       _ut.test('test_getExplicitlyImportsCore', () {
         final __test = new LibraryTest();
         runJUnitTest(__test, __test.test_getExplicitlyImportsCore);
       });
       _ut.test('test_getExports', () {
         final __test = new LibraryTest();
         runJUnitTest(__test, __test.test_getExports);
       });
@@ skipping 25 matching lines @@
         final __test = new LibraryTest();
         runJUnitTest(__test, __test.test_setImportedLibraries);
       });
       _ut.test('test_setLibraryElement', () {
         final __test = new LibraryTest();
         runJUnitTest(__test, __test.test_setLibraryElement);
       });
     });
   }
 }
+
+class DeclarationMatcherTest extends ResolverTestCase {
+  void test_compilationUnitMatches_false_topLevelVariable() {
+    assertCompilationUnitMatches(false, EngineTestCase.createSource([
+        "class C {",
+        "  int m(int p) {",
+        "    return p + p;",
+        "  }",
+        "}"]), EngineTestCase.createSource([
+        "const int ZERO = 0;",
+        "class C {",
+        "  int m(int p) {",
+        "    return (p * p) + (p * p) + ZERO;",
+        "  }",
+        "}"]));
+  }
+
+  void test_compilationUnitMatches_true_different() {
+    assertCompilationUnitMatches(true, EngineTestCase.createSource([
+        "class C {",
+        "  int m(int p) {",
+        "    return p + p;",
+        "  }",
+        "}"]), EngineTestCase.createSource([
+        "class C {",
+        "  int m(int p) {",
+        "    return (p * p) + (p * p);",
+        "  }",
+        "}"]));
+  }
+
+  void test_compilationUnitMatches_true_same() {
+    String content = EngineTestCase.createSource([
+        "class C {",
+        "  int m(int p) {",
+        "    return p + p;",
+        "  }",
+        "}"]);
+    assertCompilationUnitMatches(true, content, content);
+  }
+
+  void test_methodDeclarationMatches_false_localVariable() {
+    assertMethodMatches(false, EngineTestCase.createSource([
+        "class C {",
+        "  int m(int p) {",
+        "    return p + p;",
+        "  }",
+        "}"]), EngineTestCase.createSource([
+        "class C {",
+        "  int m(int p) {",
+        "    int product = p * p;",
+        "    return product + product;",
+        "  }",
+        "}"]));
+  }
+
+  void test_methodDeclarationMatches_false_parameter() {
+    assertMethodMatches(false, EngineTestCase.createSource([
+        "class C {",
+        "  int m(int p) {",
+        "    return p + p;",
+        "  }",
+        "}"]), EngineTestCase.createSource([
+        "class C {",
+        "  int m(int p, int q) {",
+        "    return (p * q) + (q * p);",
+        "  }",
+        "}"]));
+  }
+
+  void test_methodDeclarationMatches_true_different() {
+    assertMethodMatches(true, EngineTestCase.createSource([
+        "class C {",
+        "  int m(int p) {",
+        "    return p + p;",
+        "  }",
+        "}"]), EngineTestCase.createSource([
+        "class C {",
+        "  int m(int p) {",
+        "    return (p * p) + (p * p);",
+        "  }",
+        "}"]));
+  }
+
+  void test_methodDeclarationMatches_true_same() {
+    String content = EngineTestCase.createSource([
+        "class C {",
+        "  int m(int p) {",
+        "    return p + p;",
+        "  }",
+        "}"]);
+    assertMethodMatches(true, content, content);
+  }
+
+  void assertCompilationUnitMatches(bool expectMatch, String oldContent, String newContent) {
+    Source source = addSource(oldContent);
+    LibraryElement library = resolve(source);
+    CompilationUnit oldUnit = resolveCompilationUnit(source, library);
+    AnalysisContext context = analysisContext;
+    context.setContents(source, newContent);
+    CompilationUnit newUnit = context.parseCompilationUnit(source);
+    DeclarationMatcher matcher = new DeclarationMatcher();
+    JUnitTestCase.assertEquals(expectMatch, matcher.matches(newUnit, oldUnit.element));
+  }
+
+  void assertMethodMatches(bool expectMatch, String oldContent, String newContent) {
+    Source source = addSource(oldContent);
+    LibraryElement library = resolve(source);
+    CompilationUnit oldUnit = resolveCompilationUnit(source, library);
+    MethodElement element = getMethod2(oldUnit).element as MethodElement;
+    AnalysisContext context = analysisContext;
+    context.setContents(source, newContent);
+    CompilationUnit newUnit = context.parseCompilationUnit(source);
+    MethodDeclaration newMethod = getMethod2(newUnit);
+    DeclarationMatcher matcher = new DeclarationMatcher();
+    JUnitTestCase.assertEquals(expectMatch, matcher.matches(newMethod, element));
+  }
+
+  MethodDeclaration getMethod2(CompilationUnit unit) {
+    ClassDeclaration classNode = unit.declarations[0] as ClassDeclaration;
+    return classNode.members[0] as MethodDeclaration;
+  }
+
+  static dartSuite() {
+    _ut.group('DeclarationMatcherTest', () {
+      _ut.test('test_compilationUnitMatches_false_topLevelVariable', () {
+        final __test = new DeclarationMatcherTest();
+        runJUnitTest(__test, __test.test_compilationUnitMatches_false_topLevelVariable);
+      });
+      _ut.test('test_compilationUnitMatches_true_different', () {
+        final __test = new DeclarationMatcherTest();
+        runJUnitTest(__test, __test.test_compilationUnitMatches_true_different);
+      });
+      _ut.test('test_compilationUnitMatches_true_same', () {
+        final __test = new DeclarationMatcherTest();
+        runJUnitTest(__test, __test.test_compilationUnitMatches_true_same);
+      });
+      _ut.test('test_methodDeclarationMatches_false_localVariable', () {
+        final __test = new DeclarationMatcherTest();
+        runJUnitTest(__test, __test.test_methodDeclarationMatches_false_localVariable);
+      });
+      _ut.test('test_methodDeclarationMatches_false_parameter', () {
+        final __test = new DeclarationMatcherTest();
+        runJUnitTest(__test, __test.test_methodDeclarationMatches_false_parameter);
+      });
+      _ut.test('test_methodDeclarationMatches_true_different', () {
+        final __test = new DeclarationMatcherTest();
+        runJUnitTest(__test, __test.test_methodDeclarationMatches_true_different);
+      });
+      _ut.test('test_methodDeclarationMatches_true_same', () {
+        final __test = new DeclarationMatcherTest();
+        runJUnitTest(__test, __test.test_methodDeclarationMatches_true_same);
+      });
+    });
+  }
+}
+
 class StaticTypeWarningCodeTest extends ResolverTestCase {
   void fail_inaccessibleSetter() {
     Source source = addSource(EngineTestCase.createSource([]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INACCESSIBLE_SETTER]);
     verify([source]);
   }
+
   void test_expectedOneListTypeArgument() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  <int, int> [];", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.EXPECTED_ONE_LIST_TYPE_ARGUMENTS]);
     verify([source]);
   }
+
   void test_expectedTwoMapTypeArguments_one() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  <int> {};", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.EXPECTED_TWO_MAP_TYPE_ARGUMENTS]);
     verify([source]);
   }
+
   void test_expectedTwoMapTypeArguments_three() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  <int, int, int> {};", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.EXPECTED_TWO_MAP_TYPE_ARGUMENTS]);
     verify([source]);
   }
+
   void test_inconsistentMethodInheritance_paramCount() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  int x();",
         "}",
         "abstract class B {",
         "  int x(int y);",
         "}",
         "class C implements A, B {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INCONSISTENT_METHOD_INHERITANCE]);
     verify([source]);
   }
+
   void test_inconsistentMethodInheritance_paramType() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  x(int i);",
         "}",
         "abstract class B {",
         "  x(String s);",
         "}",
         "abstract class C implements A, B {}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INCONSISTENT_METHOD_INHERITANCE]);
     verify([source]);
   }
+
   void test_inconsistentMethodInheritance_returnType() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  int x();",
         "}",
         "abstract class B {",
         "  String x();",
         "}",
         "abstract class C implements A, B {}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INCONSISTENT_METHOD_INHERITANCE]);
     verify([source]);
   }
+
   void test_instanceAccessToStaticMember_method_invocation() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static m() {}",
         "}",
         "main(A a) {",
         "  a.m();",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INSTANCE_ACCESS_TO_STATIC_MEMBER]);
     verify([source]);
   }
+
   void test_instanceAccessToStaticMember_method_reference() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static m() {}",
         "}",
         "main(A a) {",
         "  a.m;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INSTANCE_ACCESS_TO_STATIC_MEMBER]);
     verify([source]);
   }
+
   void test_instanceAccessToStaticMember_propertyAccess_field() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static var f;",
         "}",
         "main(A a) {",
         "  a.f;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INSTANCE_ACCESS_TO_STATIC_MEMBER]);
     verify([source]);
   }
+
   void test_instanceAccessToStaticMember_propertyAccess_getter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static get f => 42;",
         "}",
         "main(A a) {",
         "  a.f;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INSTANCE_ACCESS_TO_STATIC_MEMBER]);
     verify([source]);
   }
+
   void test_instanceAccessToStaticMember_propertyAccess_setter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static set f(x) {}",
         "}",
         "main(A a) {",
         "  a.f = 42;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INSTANCE_ACCESS_TO_STATIC_MEMBER]);
     verify([source]);
   }
+
   void test_invalidAssignment_compoundAssignment() {
     Source source = addSource(EngineTestCase.createSource([
         "class byte {",
         "  int _value;",
         "  byte(this._value);",
         "  int operator +(int val) {}",
         "}",
         "",
         "void main() {",
         "  byte b = new byte(52);",
         "  b += 3;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVALID_ASSIGNMENT]);
     verify([source]);
   }
+
   void test_invalidAssignment_defaultValue_named() {
     Source source = addSource(EngineTestCase.createSource(["f({String x: 0}) {", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVALID_ASSIGNMENT]);
     verify([source]);
   }
+
   void test_invalidAssignment_defaultValue_optional() {
     Source source = addSource(EngineTestCase.createSource(["f([String x = 0]) {", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVALID_ASSIGNMENT]);
     verify([source]);
   }
+
   void test_invalidAssignment_instanceVariable() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int x;",
         "}",
         "f() {",
         "  A a;",
         "  a.x = '0';",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVALID_ASSIGNMENT]);
     verify([source]);
   }
+
   void test_invalidAssignment_localVariable() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  int x;", "  x = '0';", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVALID_ASSIGNMENT]);
     verify([source]);
   }
+
   void test_invalidAssignment_staticVariable() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static int x;",
         "}",
         "f() {",
         "  A.x = '0';",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVALID_ASSIGNMENT]);
     verify([source]);
   }
+
   void test_invalidAssignment_topLevelVariableDeclaration() {
     Source source = addSource(EngineTestCase.createSource(["int x = 'string';"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVALID_ASSIGNMENT]);
     verify([source]);
   }
+
   void test_invalidAssignment_variableDeclaration() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x = 'string';", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVALID_ASSIGNMENT]);
     verify([source]);
   }
+
   void test_invocationOfNonFunction_class() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  void m() {", "    A();", "  }", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVOCATION_OF_NON_FUNCTION]);
   }
+
   void test_invocationOfNonFunction_localVariable() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  int x;", "  return x();", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVOCATION_OF_NON_FUNCTION]);
     verify([source]);
   }
+
   void test_invocationOfNonFunction_ordinaryInvocation() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static int x;",
         "}",
         "class B {",
         "  m() {",
         "    A.x();",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVOCATION_OF_NON_FUNCTION]);
   }
+
   void test_invocationOfNonFunction_staticInvocation() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static int get g => 0;",
         "  f() {",
         "    A.g();",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVOCATION_OF_NON_FUNCTION]);
   }
+
   void test_invocationOfNonFunction_superExpression() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int get g => 0;",
         "}",
         "class B extends A {",
         "  m() {",
         "    var v = super.g();",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVOCATION_OF_NON_FUNCTION]);
     verify([source]);
   }
+
   void test_invocationOfNonFunctionExpression_literal() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  3(5);", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVOCATION_OF_NON_FUNCTION_EXPRESSION]);
     verify([source]);
   }
+
   void test_nonBoolCondition_conditional() {
     Source source = addSource(EngineTestCase.createSource(["f() { return 3 ? 2 : 1; }"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.NON_BOOL_CONDITION]);
     verify([source]);
   }
+
   void test_nonBoolCondition_do() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  do {} while (3);", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.NON_BOOL_CONDITION]);
     verify([source]);
   }
+
   void test_nonBoolCondition_if() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  if (3) return 2; else return 1;", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.NON_BOOL_CONDITION]);
     verify([source]);
   }
+
   void test_nonBoolCondition_while() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  while (3) {}", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.NON_BOOL_CONDITION]);
     verify([source]);
   }
+
   void test_nonBoolExpression_functionType() {
     Source source = addSource(EngineTestCase.createSource([
         "int makeAssertion() => 1;",
         "f() {",
         "  assert(makeAssertion);",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.NON_BOOL_EXPRESSION]);
     verify([source]);
   }
+
   void test_nonBoolExpression_interfaceType() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  assert(0);", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.NON_BOOL_EXPRESSION]);
     verify([source]);
   }
+
   void test_nonBoolNegationExpression() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  !42;", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.NON_BOOL_NEGATION_EXPRESSION]);
     verify([source]);
   }
+
   void test_nonTypeAsTypeArgument_notAType() {
     Source source = addSource(EngineTestCase.createSource(["int A;", "class B<E> {}", "f(B<A> b) {}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.NON_TYPE_AS_TYPE_ARGUMENT]);
     verify([source]);
   }
+
   void test_nonTypeAsTypeArgument_undefinedIdentifier() {
     Source source = addSource(EngineTestCase.createSource(["class B<E> {}", "f(B<A> b) {}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.NON_TYPE_AS_TYPE_ARGUMENT]);
     verify([source]);
   }
+
   void test_returnOfInvalidType_expressionFunctionBody_function() {
     Source source = addSource(EngineTestCase.createSource(["int f() => '0';"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.RETURN_OF_INVALID_TYPE]);
     verify([source]);
   }
+
   void test_returnOfInvalidType_expressionFunctionBody_getter() {
     Source source = addSource(EngineTestCase.createSource(["int get g => '0';"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.RETURN_OF_INVALID_TYPE]);
     verify([source]);
   }
+
   void test_returnOfInvalidType_expressionFunctionBody_localFunction() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  String m() {",
         "    int f() => '0';",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.RETURN_OF_INVALID_TYPE]);
     verify([source]);
   }
+
   void test_returnOfInvalidType_expressionFunctionBody_method() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int f() => '0';", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.RETURN_OF_INVALID_TYPE]);
     verify([source]);
   }
+
   void test_returnOfInvalidType_expressionFunctionBody_void() {
     Source source = addSource(EngineTestCase.createSource(["void f() => 42;"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.RETURN_OF_INVALID_TYPE]);
     verify([source]);
   }
+
   void test_returnOfInvalidType_function() {
     Source source = addSource(EngineTestCase.createSource(["int f() { return '0'; }"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.RETURN_OF_INVALID_TYPE]);
     verify([source]);
   }
+
   void test_returnOfInvalidType_getter() {
     Source source = addSource(EngineTestCase.createSource(["int get g { return '0'; }"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.RETURN_OF_INVALID_TYPE]);
     verify([source]);
   }
+
   void test_returnOfInvalidType_localFunction() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  String m() {",
         "    int f() { return '0'; }",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.RETURN_OF_INVALID_TYPE]);
     verify([source]);
   }
+
   void test_returnOfInvalidType_method() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int f() { return '0'; }", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.RETURN_OF_INVALID_TYPE]);
     verify([source]);
   }
+
   void test_returnOfInvalidType_void() {
     Source source = addSource(EngineTestCase.createSource(["void f() { return 42; }"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.RETURN_OF_INVALID_TYPE]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_classTypeAlias() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class C {}",
         "class G<E extends A> {}",
         "class D = G<B> with C;"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_extends() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class G<E extends A> {}",
         "class C extends G<B>{}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_fieldFormalParameter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class G<E extends A> {}",
         "class C {",
         "  var f;",
         "  C(G<B> this.f) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_functionReturnType() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class G<E extends A> {}",
         "G<B> f() {}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_functionTypeAlias() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class G<E extends A> {}",
         "typedef G<B> f();"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_functionTypedFormalParameter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class G<E extends A> {}",
         "f(G<B> h()) {}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_implements() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class G<E extends A> {}",
         "class C implements G<B>{}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_is() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class G<E extends A> {}",
         "var b = 1 is G<B>;"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_methodReturnType() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class G<E extends A> {}",
         "class C {",
         "  G<B> m() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_new() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class G<E extends A> {}",
         "f() { return new G<B>(); }"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_new_superTypeOfUpperBound() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {}",
         "class C extends B {}",
         "class G<E extends B> {}",
         "f() { return new G<A>(); }"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_parameter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class G<E extends A> {}",
         "f(G<B> g) {}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_redirectingConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class X<T extends A> {",
         "  X(int x, int y) {}",
         "  factory X.name(int x, int y) = X<B>;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_typeArgumentList() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class C<E> {}",
         "class D<E extends A> {}",
         "C<D<B>> Var;"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_typeParameter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class C {}",
         "class G<E extends A> {}",
         "class D<F extends G<B>> {}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_variableDeclaration() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class G<E extends A> {}",
         "G<B> g;"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_with() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class G<E extends A> {}",
         "class C extends Object with G<B>{}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_typeParameterSupertypeOfItsBound() {
     Source source = addSource(EngineTestCase.createSource(["class A<T extends T> {", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.TYPE_PARAMETER_SUPERTYPE_OF_ITS_BOUND]);
     verify([source]);
   }
+
   void test_typePromotion_booleanAnd_useInRight_accessedInClosureRight_mutated() {
     Source source = addSource(EngineTestCase.createSource([
         "callMe(f()) { f(); }",
         "main(Object p) {",
         "  (p is String) && callMe(() { p.length; });",
         "  p = 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_booleanAnd_useInRight_mutatedInLeft() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p) {",
         "  ((p is String) && ((p = 42) == 42)) && p.length != 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_booleanAnd_useInRight_mutatedInRight() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p) {",
         "  (p is String) && (((p = 42) == 42) && p.length != 0);",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_conditional_useInThen_accessedInClosure_hasAssignment_after() {
     Source source = addSource(EngineTestCase.createSource([
         "callMe(f()) { f(); }",
         "main(Object p) {",
         "  p is String ? callMe(() { p.length; }) : 0;",
         "  p = 42;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_conditional_useInThen_accessedInClosure_hasAssignment_before() {
     Source source = addSource(EngineTestCase.createSource([
         "callMe(f()) { f(); }",
         "main(Object p) {",
         "  p = 42;",
         "  p is String ? callMe(() { p.length; }) : 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_conditional_useInThen_hasAssignment() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p) {",
         "  p is String ? (p.length + (p = 42)) : 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_if_accessedInClosure_hasAssignment() {
     Source source = addSource(EngineTestCase.createSource([
         "callMe(f()) { f(); }",
         "main(Object p) {",
         "  if (p is String) {",
         "    callMe(() {",
         "      p.length;",
         "    });",
         "  }",
         "  p = 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_if_and_right_hasAssignment() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p) {",
         "  if (p is String && (p = null) == null) {",
         "    p.length;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_if_extends_notMoreSpecific_dynamic() {
     Source source = addSource(EngineTestCase.createSource([
         "class V {}",
         "class A<T> {}",
         "class B<S> extends A<S> {",
         "  var b;",
         "}",
         "",
         "main(A<V> p) {",
         "  if (p is B) {",
         "    p.b;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_if_extends_notMoreSpecific_notMoreSpecificTypeArg() {
     Source source = addSource(EngineTestCase.createSource([
         "class V {}",
         "class A<T> {}",
         "class B<S> extends A<S> {",
         "  var b;",
         "}",
         "",
         "main(A<V> p) {",
         "  if (p is B<int>) {",
         "    p.b;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_if_hasAssignment_after() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p) {",
         "  if (p is String) {",
         "    p.length;",
         "    p = 0;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_if_hasAssignment_before() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p) {",
         "  if (p is String) {",
         "    p = 0;",
         "    p.length;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_if_hasAssignment_inClosure_anonymous_after() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p) {",
         "  if (p is String) {",
         "    p.length;",
         "  }",
         "  () {p = 0;};",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_if_hasAssignment_inClosure_anonymous_before() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p) {",
         "  () {p = 0;};",
         "  if (p is String) {",
         "    p.length;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_if_hasAssignment_inClosure_function_after() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p) {",
         "  if (p is String) {",
         "    p.length;",
         "  }",
         "  f() {p = 0;};",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_if_hasAssignment_inClosure_function_before() {
     Source source = addSource(EngineTestCase.createSource([
         "main(Object p) {",
         "  f() {p = 0;};",
         "  if (p is String) {",
         "    p.length;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_if_implements_notMoreSpecific_dynamic() {
     Source source = addSource(EngineTestCase.createSource([
         "class V {}",
         "class A<T> {}",
         "class B<S> implements A<S> {",
         "  var b;",
         "}",
         "",
         "main(A<V> p) {",
         "  if (p is B) {",
         "    p.b;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_typePromotion_if_with_notMoreSpecific_dynamic() {
     Source source = addSource(EngineTestCase.createSource([
         "class V {}",
         "class A<T> {}",
         "class B<S> extends Object with A<S> {",
         "  var b;",
         "}",
         "",
         "main(A<V> p) {",
         "  if (p is B) {",
         "    p.b;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_undefinedGetter() {
     Source source = addSource(EngineTestCase.createSource(["class T {}", "f(T e) { return e.m; }"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_undefinedGetter_static() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "var a = A.B;"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
   }
+
   void test_undefinedMethod() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  void m() {", "    n();", "  }", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_METHOD]);
   }
+
   void test_undefinedMethod_assignmentExpression() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {",
         "  f(A a) {",
         "    A a2 = new A();",
         "    a += a2;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_METHOD]);
   }
+
   void test_undefinedMethod_ignoreTypePropagation() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  m() {}",
         "}",
         "class C {",
         "  f() {",
         "    A a = new B();",
         "    a.m();",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_METHOD]);
   }
+
   void test_undefinedMethod_private() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class A {", "  _foo() {}", "}"]));
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib.dart';",
         "class B extends A {",
         "  test() {",
         "    _foo();",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_METHOD]);
   }
+
   void test_undefinedOperator_indexBoth() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "f(A a) {", "  a[0]++;", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   void test_undefinedOperator_indexGetter() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "f(A a) {", "  a[0];", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   void test_undefinedOperator_indexSetter() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "f(A a) {", "  a[0] = 1;", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   void test_undefinedOperator_plus() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "f(A a) {", "  a + 1;", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   void test_undefinedOperator_postfixExpression() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "f(A a) {", "  a++;", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   void test_undefinedOperator_prefixExpression() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "f(A a) {", "  ++a;", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   void test_undefinedSetter() {
     Source source = addSource(EngineTestCase.createSource(["class T {}", "f(T e1) { e1.m = 0; }"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_SETTER]);
   }
+
   void test_undefinedSetter_static() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "f() { A.B = 0;}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_SETTER]);
   }
+
   void test_undefinedSuperMethod() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  m() { return super.m(); }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_SUPER_METHOD]);
   }
+
   void test_unqualifiedReferenceToNonLocalStaticMember_getter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static int get a => 0;",
         "}",
         "class B extends A {",
         "  int b() {",
         "    return a;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNQUALIFIED_REFERENCE_TO_NON_LOCAL_STATIC_MEMBER]);
     verify([source]);
   }
+
   void test_unqualifiedReferenceToNonLocalStaticMember_method() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static void a() {}",
         "}",
         "class B extends A {",
         "  void b() {",
         "    a();",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNQUALIFIED_REFERENCE_TO_NON_LOCAL_STATIC_MEMBER]);
     verify([source]);
   }
+
   void test_unqualifiedReferenceToNonLocalStaticMember_setter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static set a(x) {}",
         "}",
         "class B extends A {",
         "  b(y) {",
         "    a = y;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNQUALIFIED_REFERENCE_TO_NON_LOCAL_STATIC_MEMBER]);
     verify([source]);
   }
+
   void test_wrongNumberOfTypeArguments_tooFew() {
     Source source = addSource(EngineTestCase.createSource(["class A<E, F> {}", "A<A> a = null;"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS]);
     verify([source]);
   }
+
   void test_wrongNumberOfTypeArguments_tooMany() {
     Source source = addSource(EngineTestCase.createSource(["class A<E> {}", "A<A, A> a = null;"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS]);
     verify([source]);
   }
+
   void test_wrongNumberOfTypeArguments_typeTest_tooFew() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class C<K, V> {}",
         "f(p) {",
         "  return p is C<A>;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS]);
     verify([source]);
   }
+
   void test_wrongNumberOfTypeArguments_typeTest_tooMany() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class C<E> {}",
         "f(p) {",
         "  return p is C<A, A>;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS]);
     verify([source]);
   }
+
   static dartSuite() {
     _ut.group('StaticTypeWarningCodeTest', () {
       _ut.test('test_expectedOneListTypeArgument', () {
         final __test = new StaticTypeWarningCodeTest();
         runJUnitTest(__test, __test.test_expectedOneListTypeArgument);
       });
       _ut.test('test_expectedTwoMapTypeArguments_one', () {
         final __test = new StaticTypeWarningCodeTest();
         runJUnitTest(__test, __test.test_expectedTwoMapTypeArguments_one);
       });
@@ skipping 393 matching lines @@
         final __test = new StaticTypeWarningCodeTest();
         runJUnitTest(__test, __test.test_wrongNumberOfTypeArguments_typeTest_tooFew);
       });
       _ut.test('test_wrongNumberOfTypeArguments_typeTest_tooMany', () {
         final __test = new StaticTypeWarningCodeTest();
         runJUnitTest(__test, __test.test_wrongNumberOfTypeArguments_typeTest_tooMany);
       });
     });
   }
 }
+
 class HintCodeTest extends ResolverTestCase {
   void fail_isInt() {
     Source source = addSource(EngineTestCase.createSource(["var v = 1 is int;"]));
     resolve(source);
     assertErrors(source, [HintCode.IS_INT]);
     verify([source]);
   }
+
   void fail_isNotInt() {
     Source source = addSource(EngineTestCase.createSource(["var v = 1 is! int;"]));
     resolve(source);
     assertErrors(source, [HintCode.IS_NOT_INT]);
     verify([source]);
   }
+
   void fail_overrideEqualsButNotHashCode() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  bool operator ==(x) {}", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.OVERRIDE_EQUALS_BUT_NOT_HASH_CODE]);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_conditionalElse() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  true ? 1 : 2;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_conditionalElse_nested() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  true ? true : false && false;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_conditionalIf() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  false ? 1 : 2;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_conditionalIf_nested() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  false ? false && false : true;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_else() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  if(true) {} else {}", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_else_nested() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  if(true) {} else {if (false) {}}", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_if() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  if(false) {}", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_if_nested() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  if(false) {if(false) {}}", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_while() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  while(false) {}", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_while_nested() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  while(false) {if(false) {}}", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_deadCatch_catchFollowingCatch() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "f() {",
         "  try {} catch (e) {} catch (e) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE_CATCH_FOLLOWING_CATCH]);
     verify([source]);
   }
+
   void test_deadCode_deadCatch_catchFollowingCatch_nested() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "f() {",
         "  try {} catch (e) {} catch (e) {if(false) {}}",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE_CATCH_FOLLOWING_CATCH]);
     verify([source]);
   }
+
   void test_deadCode_deadCatch_catchFollowingCatch_object() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {",
         "  try {} on Object catch (e) {} catch (e) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE_CATCH_FOLLOWING_CATCH]);
     verify([source]);
   }
+
   void test_deadCode_deadCatch_catchFollowingCatch_object_nested() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {",
         "  try {} on Object catch (e) {} catch (e) {if(false) {}}",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE_CATCH_FOLLOWING_CATCH]);
     verify([source]);
   }
+
   void test_deadCode_deadCatch_onCatchSubtype() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {}",
         "f() {",
         "  try {} on A catch (e) {} on B catch (e) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE_ON_CATCH_SUBTYPE]);
     verify([source]);
   }
+
   void test_deadCode_deadCatch_onCatchSubtype_nested() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {}",
         "f() {",
         "  try {} on A catch (e) {} on B catch (e) {if(false) {}}",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE_ON_CATCH_SUBTYPE]);
     verify([source]);
   }
+
   void test_deadCode_deadOperandLHS_and() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  bool b = false && false;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_deadOperandLHS_and_nested() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  bool b = false && (false && false);", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_deadOperandLHS_or() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  bool b = true || true;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_deadOperandLHS_or_nested() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  bool b = true || (false && false);", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_statementAfterReturn_function() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {",
         "  var one = 1;",
         "  return;",
         "  var two = 2;",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_statementAfterReturn_ifStatement() {
     Source source = addSource(EngineTestCase.createSource([
         "f(bool b) {",
         "  if(b) {",
         "    var one = 1;",
         "    return;",
         "    var two = 2;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_statementAfterReturn_method() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m() {",
         "    var one = 1;",
         "    return;",
         "    var two = 2;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_statementAfterReturn_nested() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {",
         "  var one = 1;",
         "  return;",
         "  if(false) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_deadCode_statementAfterReturn_twoReturns() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {",
         "  var one = 1;",
         "  return;",
         "  var two = 2;",
         "  return;",
         "  var three = 3;",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
+
+  void test_deprecatedAnnotationUse_assignment() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class A {",
+        "  @deprecated",
+        "  A operator+(A a) {}",
+        "}",
+        "f(A a) {",
+        "  A b;",
+        "  a += b;",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [HintCode.DEPRECATED_MEMBER_USE]);
+    verify([source]);
+  }
+
+  void test_deprecatedAnnotationUse_deprecated() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class A {",
+        "  @deprecated",
+        "  m() {}",
+        "  n() {m();}",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [HintCode.DEPRECATED_MEMBER_USE]);
+    verify([source]);
+  }
+
+  void test_deprecatedAnnotationUse_Deprecated() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class A {",
+        "  @Deprecated('0.9')",
+        "  m() {}",
+        "  n() {m();}",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [HintCode.DEPRECATED_MEMBER_USE]);
+    verify([source]);
+  }
+
+  void test_deprecatedAnnotationUse_export() {
+    Source source = addSource(EngineTestCase.createSource(["export 'deprecated_library.dart';"]));
+    addSource2("/deprecated_library.dart", EngineTestCase.createSource([
+        "@deprecated",
+        "library deprecated_library;",
+        "class A {}"]));
+    resolve(source);
+    assertErrors(source, [HintCode.DEPRECATED_MEMBER_USE]);
+    verify([source]);
+  }
+
+  void test_deprecatedAnnotationUse_getter() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class A {",
+        "  @deprecated",
+        "  get m => 1;",
+        "}",
+        "f(A a) {",
+        "  return a.m;",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [HintCode.DEPRECATED_MEMBER_USE]);
+    verify([source]);
+  }
+
+  void test_deprecatedAnnotationUse_import() {
+    Source source = addSource(EngineTestCase.createSource(["import 'deprecated_library.dart';", "f(A a) {}"]));
+    addSource2("/deprecated_library.dart", EngineTestCase.createSource([
+        "@deprecated",
+        "library deprecated_library;",
+        "class A {}"]));
+    resolve(source);
+    assertErrors(source, [HintCode.DEPRECATED_MEMBER_USE]);
+    verify([source]);
+  }
+
+  void test_deprecatedAnnotationUse_indexExpression() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class A {",
+        "  @deprecated",
+        "  operator[](int i) {}",
+        "}",
+        "f(A a) {",
+        "  return a[1];",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [HintCode.DEPRECATED_MEMBER_USE]);
+    verify([source]);
+  }
+
+  void test_deprecatedAnnotationUse_instanceCreation() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class A {",
+        "  @deprecated",
+        "  A(int i) {}",
+        "}",
+        "f() {",
+        "  A a = new A(1);",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [HintCode.DEPRECATED_MEMBER_USE]);
+    verify([source]);
+  }
+
+  void test_deprecatedAnnotationUse_instanceCreation_namedConstructor() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class A {",
+        "  @deprecated",
+        "  A.named(int i) {}",
+        "}",
+        "f() {",
+        "  A a = new A.named(1);",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [HintCode.DEPRECATED_MEMBER_USE]);
+    verify([source]);
+  }
+
+  void test_deprecatedAnnotationUse_operator() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class A {",
+        "  @deprecated",
+        "  operator+(A a) {}",
+        "}",
+        "f(A a) {",
+        "  A b;",
+        "  return a + b;",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [HintCode.DEPRECATED_MEMBER_USE]);
+    verify([source]);
+  }
+
+  void test_deprecatedAnnotationUse_setter() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class A {",
+        "  @deprecated",
+        "  set s(v) {}",
+        "}",
+        "f(A a) {",
+        "  return a.s = 1;",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [HintCode.DEPRECATED_MEMBER_USE]);
+    verify([source]);
+  }
+
+  void test_deprecatedAnnotationUse_superConstructor() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class A {",
+        "  @deprecated",
+        "  A() {}",
+        "}",
+        "class B extends A {",
+        "  B() : super() {}",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [HintCode.DEPRECATED_MEMBER_USE]);
+    verify([source]);
+  }
+
+  void test_deprecatedAnnotationUse_superConstructor_namedConstructor() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class A {",
+        "  @deprecated",
+        "  A.named() {}",
+        "}",
+        "class B extends A {",
+        "  B() : super.named() {}",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [HintCode.DEPRECATED_MEMBER_USE]);
+    verify([source]);
+  }
+
   void test_divisionOptimization_double() {
     Source source = addSource(EngineTestCase.createSource([
         "f(double x, double y) {",
         "  var v = (x / y).toInt();",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DIVISION_OPTIMIZATION]);
     verify([source]);
   }
+
   void test_divisionOptimization_int() {
     Source source = addSource(EngineTestCase.createSource(["f(int x, int y) {", "  var v = (x / y).toInt();", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DIVISION_OPTIMIZATION]);
     verify([source]);
   }
+
   void test_divisionOptimization_propagatedType() {
     Source source = addSource(EngineTestCase.createSource([
         "f(x, y) {",
         "  x = 1;",
         "  y = 1;",
         "  var v = (x / y).toInt();",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DIVISION_OPTIMIZATION]);
     verify([source]);
   }
+
   void test_divisionOptimization_wrappedBinaryExpression() {
     Source source = addSource(EngineTestCase.createSource([
         "f(int x, int y) {",
         "  var v = (((x / y))).toInt();",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.DIVISION_OPTIMIZATION]);
     verify([source]);
   }
+
   void test_duplicateImport() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "import 'lib1.dart';",
         "import 'lib1.dart';",
         "A a;"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class A {}"]));
     resolve(source);
     assertErrors(source, [HintCode.DUPLICATE_IMPORT]);
     verify([source]);
   }
+
   void test_duplicateImport2() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "import 'lib1.dart';",
         "import 'lib1.dart';",
         "import 'lib1.dart';",
         "A a;"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class A {}"]));
     resolve(source);
     assertErrors(source, [HintCode.DUPLICATE_IMPORT, HintCode.DUPLICATE_IMPORT]);
     verify([source]);
   }
+
   void test_duplicateImport3() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "import 'lib1.dart' as M show A hide B;",
         "import 'lib1.dart' as M show A hide B;",
         "M.A a;"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class A {}", "class B {}"]));
     resolve(source);
     assertErrors(source, [HintCode.DUPLICATE_IMPORT, HintCode.UNUSED_IMPORT]);
     verify([source]);
   }
+
   void test_isDouble() {
     Source source = addSource(EngineTestCase.createSource(["var v = 1 is double;"]));
     resolve(source);
     assertErrors(source, [HintCode.IS_DOUBLE]);
     verify([source]);
   }
+
   void test_isNotDouble() {
     Source source = addSource(EngineTestCase.createSource(["var v = 1 is! double;"]));
     resolve(source);
     assertErrors(source, [HintCode.IS_NOT_DOUBLE]);
     verify([source]);
   }
+
   void test_overriddingPrivateMember_getter() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "class B extends A {",
         "  get _g => 0;",
         "}"]));
     Source source2 = addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class A {", "  get _g => 0;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.OVERRIDDING_PRIVATE_MEMBER]);
     verify([source, source2]);
   }
+
   void test_overriddingPrivateMember_method() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "class B extends A {",
         "  _m(int x) => 0;",
         "}"]));
     Source source2 = addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class A {", "  _m(int x) => 0;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.OVERRIDDING_PRIVATE_MEMBER]);
     verify([source, source2]);
   }
+
   void test_overriddingPrivateMember_method2() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "class B extends A {}",
         "class C extends B {",
         "  _m(int x) => 0;",
         "}"]));
     Source source2 = addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class A {", "  _m(int x) => 0;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.OVERRIDDING_PRIVATE_MEMBER]);
     verify([source, source2]);
   }
+
   void test_overriddingPrivateMember_setter() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "class B extends A {",
         "  set _s(int x) {}",
         "}"]));
     Source source2 = addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class A {", "  set _s(int x) {}", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.OVERRIDDING_PRIVATE_MEMBER]);
     verify([source, source2]);
   }
+
   void test_typeCheck_type_is_Null() {
     Source source = addSource(EngineTestCase.createSource(["m(i) {", "  bool b = i is Null;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.TYPE_CHECK_IS_NULL]);
     verify([source]);
   }
+
   void test_typeCheck_type_not_Null() {
     Source source = addSource(EngineTestCase.createSource(["m(i) {", "  bool b = i is! Null;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.TYPE_CHECK_IS_NOT_NULL]);
     verify([source]);
   }
+
   void test_undefinedGetter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "f(var a) {",
         "  if(a is A) {",
         "    return a.m;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNDEFINED_GETTER]);
   }
+
   void test_undefinedGetter_message() {
     JUnitTestCase.assertEquals(StaticTypeWarningCode.UNDEFINED_GETTER.message, StaticWarningCode.UNDEFINED_GETTER.message);
   }
+
   void test_undefinedMethod() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {",
         "  var a = 'str';",
         "  a.notAMethodOnString();",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNDEFINED_METHOD]);
   }
+
   void test_undefinedMethod_assignmentExpression() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {",
         "  f(var a, var a2) {",
         "    a = new A();",
         "    a2 = new A();",
         "    a += a2;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNDEFINED_METHOD]);
   }
+
   void test_undefinedOperator_binaryExpression() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "f(var a) {",
         "  if(a is A) {",
         "    a + 1;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNDEFINED_OPERATOR]);
   }
+
   void test_undefinedOperator_indexBoth() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "f(var a) {",
         "  if(a is A) {",
         "    a[0]++;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNDEFINED_OPERATOR]);
   }
+
   void test_undefinedOperator_indexGetter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "f(var a) {",
         "  if(a is A) {",
         "    a[0];",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNDEFINED_OPERATOR]);
   }
+
   void test_undefinedOperator_indexSetter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "f(var a) {",
         "  if(a is A) {",
         "    a[0] = 1;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNDEFINED_OPERATOR]);
   }
+
   void test_undefinedOperator_postfixExpression() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "f(var a) {",
         "  if(a is A) {",
         "    a++;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNDEFINED_OPERATOR]);
   }
+
   void test_undefinedOperator_prefixExpression() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "f(var a) {",
         "  if(a is A) {",
         "    ++a;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNDEFINED_OPERATOR]);
   }
+
   void test_undefinedSetter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "f(var a) {",
         "  if(a is A) {",
         "    a.m = 0;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNDEFINED_SETTER]);
   }
+
   void test_undefinedSetter_message() {
     JUnitTestCase.assertEquals(StaticTypeWarningCode.UNDEFINED_SETTER.message, StaticWarningCode.UNDEFINED_SETTER.message);
   }
+
   void test_unnecessaryCast_type_supertype() {
     Source source = addSource(EngineTestCase.createSource(["m(int i) {", "  var b = i as Object;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNNECESSARY_CAST]);
     verify([source]);
   }
+
   void test_unnecessaryCast_type_type() {
     Source source = addSource(EngineTestCase.createSource(["m(num i) {", "  var b = i as num;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNNECESSARY_CAST]);
     verify([source]);
   }
+
   void test_unnecessaryTypeCheck_null_is_Null() {
     Source source = addSource(EngineTestCase.createSource(["bool b = null is Null;"]));
     resolve(source);
     assertErrors(source, [HintCode.UNNECESSARY_TYPE_CHECK_TRUE]);
     verify([source]);
   }
+
   void test_unnecessaryTypeCheck_null_not_Null() {
     Source source = addSource(EngineTestCase.createSource(["bool b = null is! Null;"]));
     resolve(source);
     assertErrors(source, [HintCode.UNNECESSARY_TYPE_CHECK_FALSE]);
     verify([source]);
   }
+
   void test_unnecessaryTypeCheck_type_is_dynamic() {
     Source source = addSource(EngineTestCase.createSource(["m(i) {", "  bool b = i is dynamic;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNNECESSARY_TYPE_CHECK_TRUE]);
     verify([source]);
   }
+
   void test_unnecessaryTypeCheck_type_is_object() {
     Source source = addSource(EngineTestCase.createSource(["m(i) {", "  bool b = i is Object;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNNECESSARY_TYPE_CHECK_TRUE]);
     verify([source]);
   }
+
   void test_unnecessaryTypeCheck_type_not_dynamic() {
     Source source = addSource(EngineTestCase.createSource(["m(i) {", "  bool b = i is! dynamic;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNNECESSARY_TYPE_CHECK_FALSE]);
     verify([source]);
   }
+
   void test_unnecessaryTypeCheck_type_not_object() {
     Source source = addSource(EngineTestCase.createSource(["m(i) {", "  bool b = i is! Object;", "}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNNECESSARY_TYPE_CHECK_FALSE]);
     verify([source]);
   }
+
   void test_unusedImport() {
     Source source = addSource(EngineTestCase.createSource(["library L;", "import 'lib1.dart';"]));
     Source source2 = addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;"]));
     resolve(source);
     assertErrors(source, [HintCode.UNUSED_IMPORT]);
     assertNoErrors(source2);
     verify([source, source2]);
   }
+
   void test_unusedImport_as() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "import 'lib1.dart';",
         "import 'lib1.dart' as one;",
         "one.A a;"]));
     Source source2 = addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class A {}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNUSED_IMPORT]);
     assertNoErrors(source2);
     verify([source, source2]);
   }
+
   void test_unusedImport_hide() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "import 'lib1.dart';",
         "import 'lib1.dart' hide A;",
         "A a;"]));
     Source source2 = addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class A {}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNUSED_IMPORT]);
     assertNoErrors(source2);
     verify([source, source2]);
   }
+
   void test_unusedImport_show() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "import 'lib1.dart' show A;",
         "import 'lib1.dart' show B;",
         "A a;"]));
     Source source2 = addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class A {}", "class B {}"]));
     resolve(source);
     assertErrors(source, [HintCode.UNUSED_IMPORT]);
     assertNoErrors(source2);
     verify([source, source2]);
   }
+
   static dartSuite() {
     _ut.group('HintCodeTest', () {
       _ut.test('test_deadCode_deadBlock_conditionalElse', () {
         final __test = new HintCodeTest();
         runJUnitTest(__test, __test.test_deadCode_deadBlock_conditionalElse);
       });
       _ut.test('test_deadCode_deadBlock_conditionalElse_nested', () {
         final __test = new HintCodeTest();
         runJUnitTest(__test, __test.test_deadCode_deadBlock_conditionalElse_nested);
       });
@@ skipping 82 matching lines @@
         runJUnitTest(__test, __test.test_deadCode_statementAfterReturn_method);
       });
       _ut.test('test_deadCode_statementAfterReturn_nested', () {
         final __test = new HintCodeTest();
         runJUnitTest(__test, __test.test_deadCode_statementAfterReturn_nested);
       });
       _ut.test('test_deadCode_statementAfterReturn_twoReturns', () {
         final __test = new HintCodeTest();
         runJUnitTest(__test, __test.test_deadCode_statementAfterReturn_twoReturns);
       });
+      _ut.test('test_deprecatedAnnotationUse_Deprecated', () {
+        final __test = new HintCodeTest();
+        runJUnitTest(__test, __test.test_deprecatedAnnotationUse_Deprecated);
+      });
+      _ut.test('test_deprecatedAnnotationUse_assignment', () {
+        final __test = new HintCodeTest();
+        runJUnitTest(__test, __test.test_deprecatedAnnotationUse_assignment);
+      });
+      _ut.test('test_deprecatedAnnotationUse_deprecated', () {
+        final __test = new HintCodeTest();
+        runJUnitTest(__test, __test.test_deprecatedAnnotationUse_deprecated);
+      });
+      _ut.test('test_deprecatedAnnotationUse_export', () {
+        final __test = new HintCodeTest();
+        runJUnitTest(__test, __test.test_deprecatedAnnotationUse_export);
+      });
+      _ut.test('test_deprecatedAnnotationUse_getter', () {
+        final __test = new HintCodeTest();
+        runJUnitTest(__test, __test.test_deprecatedAnnotationUse_getter);
+      });
+      _ut.test('test_deprecatedAnnotationUse_import', () {
+        final __test = new HintCodeTest();
+        runJUnitTest(__test, __test.test_deprecatedAnnotationUse_import);
+      });
+      _ut.test('test_deprecatedAnnotationUse_indexExpression', () {
+        final __test = new HintCodeTest();
+        runJUnitTest(__test, __test.test_deprecatedAnnotationUse_indexExpression);
+      });
+      _ut.test('test_deprecatedAnnotationUse_instanceCreation', () {
+        final __test = new HintCodeTest();
+        runJUnitTest(__test, __test.test_deprecatedAnnotationUse_instanceCreation);
+      });
+      _ut.test('test_deprecatedAnnotationUse_instanceCreation_namedConstructor', () {
+        final __test = new HintCodeTest();
+        runJUnitTest(__test, __test.test_deprecatedAnnotationUse_instanceCreation_namedConstructor);
+      });
+      _ut.test('test_deprecatedAnnotationUse_operator', () {
+        final __test = new HintCodeTest();
+        runJUnitTest(__test, __test.test_deprecatedAnnotationUse_operator);
+      });
+      _ut.test('test_deprecatedAnnotationUse_setter', () {
+        final __test = new HintCodeTest();
+        runJUnitTest(__test, __test.test_deprecatedAnnotationUse_setter);
+      });
+      _ut.test('test_deprecatedAnnotationUse_superConstructor', () {
+        final __test = new HintCodeTest();
+        runJUnitTest(__test, __test.test_deprecatedAnnotationUse_superConstructor);
+      });
+      _ut.test('test_deprecatedAnnotationUse_superConstructor_namedConstructor', () {
+        final __test = new HintCodeTest();
+        runJUnitTest(__test, __test.test_deprecatedAnnotationUse_superConstructor_namedConstructor);
+      });
       _ut.test('test_divisionOptimization_double', () {
         final __test = new HintCodeTest();
         runJUnitTest(__test, __test.test_divisionOptimization_double);
       });
       _ut.test('test_divisionOptimization_int', () {
         final __test = new HintCodeTest();
         runJUnitTest(__test, __test.test_divisionOptimization_int);
       });
       _ut.test('test_divisionOptimization_propagatedType', () {
         final __test = new HintCodeTest();
@@ skipping 139 matching lines @@
         final __test = new HintCodeTest();
         runJUnitTest(__test, __test.test_unusedImport_hide);
       });
       _ut.test('test_unusedImport_show', () {
         final __test = new HintCodeTest();
         runJUnitTest(__test, __test.test_unusedImport_show);
       });
     });
   }
 }
+
 class TypeResolverVisitorTest extends EngineTestCase {
-
   /**
    * The error listener to which errors will be reported.
    */
   GatheringErrorListener _listener;
 
   /**
    * The object representing the information about the library in which the types are being
    * resolved.
    */
   Library _library;
 
   /**
    * The type provider used to access the types.
    */
   TestTypeProvider _typeProvider;
 
   /**
    * The visitor used to resolve types needed to form the type hierarchy.
    */
   TypeResolverVisitor _visitor;
+
   void fail_visitConstructorDeclaration() {
     JUnitTestCase.fail("Not yet tested");
     _listener.assertNoErrors();
   }
+
   void fail_visitFunctionDeclaration() {
     JUnitTestCase.fail("Not yet tested");
     _listener.assertNoErrors();
   }
+
   void fail_visitFunctionTypeAlias() {
     JUnitTestCase.fail("Not yet tested");
     _listener.assertNoErrors();
   }
+
   void fail_visitFunctionTypedFormalParameter() {
     JUnitTestCase.fail("Not yet tested");
     _listener.assertNoErrors();
   }
+
   void fail_visitMethodDeclaration() {
     JUnitTestCase.fail("Not yet tested");
     _listener.assertNoErrors();
   }
+
   void fail_visitVariableDeclaration() {
     JUnitTestCase.fail("Not yet tested");
     ClassElement type = ElementFactory.classElement2("A", []);
     VariableDeclaration node = ASTFactory.variableDeclaration("a");
     ASTFactory.variableDeclarationList(null, ASTFactory.typeName(type, []), [node]);
     JUnitTestCase.assertSame(type.type, node.name.staticType);
     _listener.assertNoErrors();
   }
+
   void setUp() {
     _listener = new GatheringErrorListener();
     SourceFactory factory = new SourceFactory.con2([new FileUriResolver()]);
     AnalysisContextImpl context = new AnalysisContextImpl();
     context.sourceFactory = factory;
     Source librarySource = new FileBasedSource.con1(factory.contentCache, FileUtilities2.createFile("/lib.dart"));
     _library = new Library(context, _listener, librarySource);
     LibraryElementImpl element = new LibraryElementImpl(context, ASTFactory.libraryIdentifier2(["lib"]));
     element.definingCompilationUnit = new CompilationUnitElementImpl("lib.dart");
     _library.libraryElement = element;
     _typeProvider = new TestTypeProvider();
     _visitor = new TypeResolverVisitor.con1(_library, librarySource, _typeProvider);
   }
+
   void test_visitCatchClause_exception() {
     CatchClause clause = ASTFactory.catchClause("e", []);
     SimpleIdentifier exceptionParameter = clause.exceptionParameter;
     exceptionParameter.staticElement = new LocalVariableElementImpl(exceptionParameter);
     resolve(clause, _typeProvider.dynamicType, null, []);
     _listener.assertNoErrors();
   }
+
   void test_visitCatchClause_exception_stackTrace() {
     CatchClause clause = ASTFactory.catchClause2("e", "s", []);
     SimpleIdentifier exceptionParameter = clause.exceptionParameter;
     exceptionParameter.staticElement = new LocalVariableElementImpl(exceptionParameter);
     SimpleIdentifier stackTraceParameter = clause.stackTraceParameter;
     stackTraceParameter.staticElement = new LocalVariableElementImpl(stackTraceParameter);
     resolve(clause, _typeProvider.dynamicType, _typeProvider.stackTraceType, []);
     _listener.assertNoErrors();
   }
+
   void test_visitCatchClause_on_exception() {
     ClassElement exceptionElement = ElementFactory.classElement2("E", []);
     TypeName exceptionType = ASTFactory.typeName(exceptionElement, []);
     CatchClause clause = ASTFactory.catchClause4(exceptionType, "e", []);
     SimpleIdentifier exceptionParameter = clause.exceptionParameter;
     exceptionParameter.staticElement = new LocalVariableElementImpl(exceptionParameter);
     resolve(clause, exceptionElement.type, null, [exceptionElement]);
     _listener.assertNoErrors();
   }
+
   void test_visitCatchClause_on_exception_stackTrace() {
     ClassElement exceptionElement = ElementFactory.classElement2("E", []);
     TypeName exceptionType = ASTFactory.typeName(exceptionElement, []);
-    ((exceptionType.name as SimpleIdentifier)).staticElement = exceptionElement;
+    (exceptionType.name as SimpleIdentifier).staticElement = exceptionElement;
     CatchClause clause = ASTFactory.catchClause5(exceptionType, "e", "s", []);
     SimpleIdentifier exceptionParameter = clause.exceptionParameter;
     exceptionParameter.staticElement = new LocalVariableElementImpl(exceptionParameter);
     SimpleIdentifier stackTraceParameter = clause.stackTraceParameter;
     stackTraceParameter.staticElement = new LocalVariableElementImpl(stackTraceParameter);
     resolve(clause, exceptionElement.type, _typeProvider.stackTraceType, [exceptionElement]);
     _listener.assertNoErrors();
   }
+
   void test_visitClassDeclaration() {
     ClassElement elementA = ElementFactory.classElement2("A", []);
     ClassElement elementB = ElementFactory.classElement2("B", []);
     ClassElement elementC = ElementFactory.classElement2("C", []);
     ClassElement elementD = ElementFactory.classElement2("D", []);
     ExtendsClause extendsClause = ASTFactory.extendsClause(ASTFactory.typeName(elementB, []));
     WithClause withClause = ASTFactory.withClause([ASTFactory.typeName(elementC, [])]);
     ImplementsClause implementsClause = ASTFactory.implementsClause([ASTFactory.typeName(elementD, [])]);
     ClassDeclaration declaration = ASTFactory.classDeclaration(null, "A", null, extendsClause, withClause, implementsClause, []);
     declaration.name.staticElement = elementA;
     resolveNode(declaration, [elementA, elementB, elementC, elementD]);
     JUnitTestCase.assertSame(elementB.type, elementA.supertype);
     List<InterfaceType> mixins = elementA.mixins;
     EngineTestCase.assertLength(1, mixins);
     JUnitTestCase.assertSame(elementC.type, mixins[0]);
     List<InterfaceType> interfaces = elementA.interfaces;
     EngineTestCase.assertLength(1, interfaces);
     JUnitTestCase.assertSame(elementD.type, interfaces[0]);
     _listener.assertNoErrors();
   }
+
   void test_visitClassTypeAlias() {
     ClassElement elementA = ElementFactory.classElement2("A", []);
     ClassElement elementB = ElementFactory.classElement2("B", []);
     ClassElement elementC = ElementFactory.classElement2("C", []);
     ClassElement elementD = ElementFactory.classElement2("D", []);
     WithClause withClause = ASTFactory.withClause([ASTFactory.typeName(elementC, [])]);
     ImplementsClause implementsClause = ASTFactory.implementsClause([ASTFactory.typeName(elementD, [])]);
     ClassTypeAlias alias = ASTFactory.classTypeAlias("A", null, null, ASTFactory.typeName(elementB, []), withClause, implementsClause);
     alias.name.staticElement = elementA;
     resolveNode(alias, [elementA, elementB, elementC, elementD]);
     JUnitTestCase.assertSame(elementB.type, elementA.supertype);
     List<InterfaceType> mixins = elementA.mixins;
     EngineTestCase.assertLength(1, mixins);
     JUnitTestCase.assertSame(elementC.type, mixins[0]);
     List<InterfaceType> interfaces = elementA.interfaces;
     EngineTestCase.assertLength(1, interfaces);
     JUnitTestCase.assertSame(elementD.type, interfaces[0]);
     _listener.assertNoErrors();
   }
+
   void test_visitFieldFormalParameter_functionType() {
     InterfaceType intType = _typeProvider.intType;
     TypeName intTypeName = ASTFactory.typeName4("int", []);
     String innerParameterName = "a";
     SimpleFormalParameter parameter = ASTFactory.simpleFormalParameter3(innerParameterName);
     parameter.identifier.staticElement = ElementFactory.requiredParameter(innerParameterName);
     String outerParameterName = "p";
     FormalParameter node = ASTFactory.fieldFormalParameter2(null, intTypeName, outerParameterName, ASTFactory.formalParameterList([parameter]));
     node.identifier.staticElement = ElementFactory.requiredParameter(outerParameterName);
     Type2 parameterType = resolve6(node, [intType.element]);
     EngineTestCase.assertInstanceOf(FunctionType, parameterType);
     FunctionType functionType = parameterType as FunctionType;
     JUnitTestCase.assertSame(intType, functionType.returnType);
     EngineTestCase.assertLength(1, functionType.parameters);
     _listener.assertNoErrors();
   }
+
   void test_visitFieldFormalParameter_noType() {
     String parameterName = "p";
     FormalParameter node = ASTFactory.fieldFormalParameter(Keyword.VAR, null, parameterName);
     node.identifier.staticElement = ElementFactory.requiredParameter(parameterName);
     JUnitTestCase.assertSame(_typeProvider.dynamicType, resolve6(node, []));
     _listener.assertNoErrors();
   }
+
   void test_visitFieldFormalParameter_type() {
     InterfaceType intType = _typeProvider.intType;
     TypeName intTypeName = ASTFactory.typeName4("int", []);
     String parameterName = "p";
     FormalParameter node = ASTFactory.fieldFormalParameter(null, intTypeName, parameterName);
     node.identifier.staticElement = ElementFactory.requiredParameter(parameterName);
     JUnitTestCase.assertSame(intType, resolve6(node, [intType.element]));
     _listener.assertNoErrors();
   }
+
   void test_visitSimpleFormalParameter_noType() {
     FormalParameter node = ASTFactory.simpleFormalParameter3("p");
     node.identifier.staticElement = new ParameterElementImpl.con1(ASTFactory.identifier3("p"));
     JUnitTestCase.assertSame(_typeProvider.dynamicType, resolve6(node, []));
     _listener.assertNoErrors();
   }
+
   void test_visitSimpleFormalParameter_type() {
     InterfaceType intType = _typeProvider.intType;
     ClassElement intElement = intType.element;
     FormalParameter node = ASTFactory.simpleFormalParameter4(ASTFactory.typeName(intElement, []), "p");
     SimpleIdentifier identifier = node.identifier;
     ParameterElementImpl element = new ParameterElementImpl.con1(identifier);
     identifier.staticElement = element;
     JUnitTestCase.assertSame(intType, resolve6(node, [intElement]));
     _listener.assertNoErrors();
   }
+
   void test_visitTypeName_noParameters_noArguments() {
     ClassElement classA = ElementFactory.classElement2("A", []);
     TypeName typeName = ASTFactory.typeName(classA, []);
     typeName.type = null;
     resolveNode(typeName, [classA]);
     JUnitTestCase.assertSame(classA.type, typeName.type);
     _listener.assertNoErrors();
   }
+
   void test_visitTypeName_parameters_arguments() {
     ClassElement classA = ElementFactory.classElement2("A", ["E"]);
     ClassElement classB = ElementFactory.classElement2("B", []);
     TypeName typeName = ASTFactory.typeName(classA, [ASTFactory.typeName(classB, [])]);
     typeName.type = null;
     resolveNode(typeName, [classA, classB]);
     InterfaceType resultType = typeName.type as InterfaceType;
     JUnitTestCase.assertSame(classA, resultType.element);
     List<Type2> resultArguments = resultType.typeArguments;
     EngineTestCase.assertLength(1, resultArguments);
     JUnitTestCase.assertSame(classB.type, resultArguments[0]);
     _listener.assertNoErrors();
   }
+
   void test_visitTypeName_parameters_noArguments() {
     ClassElement classA = ElementFactory.classElement2("A", ["E"]);
     TypeName typeName = ASTFactory.typeName(classA, []);
     typeName.type = null;
     resolveNode(typeName, [classA]);
     InterfaceType resultType = typeName.type as InterfaceType;
     JUnitTestCase.assertSame(classA, resultType.element);
     List<Type2> resultArguments = resultType.typeArguments;
     EngineTestCase.assertLength(1, resultArguments);
     JUnitTestCase.assertSame(DynamicTypeImpl.instance, resultArguments[0]);
     _listener.assertNoErrors();
   }
+
   void test_visitTypeName_void() {
     ClassElement classA = ElementFactory.classElement2("A", []);
     TypeName typeName = ASTFactory.typeName4("void", []);
     resolveNode(typeName, [classA]);
     JUnitTestCase.assertSame(VoidTypeImpl.instance, typeName.type);
     _listener.assertNoErrors();
   }
 
   /**
    * Analyze the given catch clause and assert that the types of the parameters have been set to the
@@ skipping 22 matching lines @@
    * Return the type associated with the given parameter after the static type analyzer has computed
    * a type for it.
    *
    * @param node the parameter with which the type is associated
    * @param definedElements the elements that are to be defined in the scope in which the element is
    *          being resolved
    * @return the type associated with the parameter
    */
   Type2 resolve6(FormalParameter node, List<Element> definedElements) {
     resolveNode(node, definedElements);
-    return ((node.identifier.staticElement as ParameterElement)).type;
+    return (node.identifier.staticElement as ParameterElement).type;
   }
 
   /**
    * Return the element associated with the given identifier after the resolver has resolved the
    * identifier.
    *
    * @param node the expression to be resolved
    * @param definedElements the elements that are to be defined in the scope in which the element is
    *          being resolved
    * @return the element to which the expression was resolved
    */
   void resolveNode(ASTNode node, List<Element> definedElements) {
     for (Element element in definedElements) {
       _library.libraryScope.define(element);
     }
     node.accept(_visitor);
   }
+
   static dartSuite() {
     _ut.group('TypeResolverVisitorTest', () {
       _ut.test('test_visitCatchClause_exception', () {
         final __test = new TypeResolverVisitorTest();
         runJUnitTest(__test, __test.test_visitCatchClause_exception);
       });
       _ut.test('test_visitCatchClause_exception_stackTrace', () {
         final __test = new TypeResolverVisitorTest();
         runJUnitTest(__test, __test.test_visitCatchClause_exception_stackTrace);
       });
@@ skipping 45 matching lines @@
         final __test = new TypeResolverVisitorTest();
         runJUnitTest(__test, __test.test_visitTypeName_parameters_noArguments);
       });
       _ut.test('test_visitTypeName_void', () {
         final __test = new TypeResolverVisitorTest();
         runJUnitTest(__test, __test.test_visitTypeName_void);
       });
     });
   }
 }
+
 class ResolverTestCase extends EngineTestCase {
-
   /**
    * The source factory used to create [Source].
    */
   SourceFactory sourceFactory;
 
   /**
    * The analysis context used to parse the compilation units being resolved.
    */
   AnalysisContextImpl analysisContext;
+
   void setUp() {
     reset();
   }
 
   /**
    * Add a source file to the content provider.
    *
    * @param contents the contents to be returned by the content provider for the specified file
    * @return the source object representing the added file
    */
@@ skipping 156 matching lines @@
    * Create a source object representing a file with the given name and give it an empty content.
    *
    * @param fileName the name of the file for which a source is to be created
    * @return the source that was created
    */
   FileBasedSource createSource2(String fileName) {
     FileBasedSource source = new FileBasedSource.con1(sourceFactory.contentCache, FileUtilities2.createFile(fileName));
     sourceFactory.setContents(source, "");
     return source;
   }
+
   static dartSuite() {
     _ut.group('ResolverTestCase', () {
     });
   }
 }
+
 class TypeProviderImplTest extends EngineTestCase {
   void test_creation() {
     InterfaceType objectType = classElement("Object", null, []).type;
     InterfaceType boolType = classElement("bool", objectType, []).type;
     InterfaceType numType = classElement("num", objectType, []).type;
     InterfaceType doubleType = classElement("double", numType, []).type;
     InterfaceType functionType = classElement("Function", objectType, []).type;
     InterfaceType intType = classElement("int", numType, []).type;
     InterfaceType listType = classElement("List", objectType, ["E"]).type;
     InterfaceType mapType = classElement("Map", objectType, ["K", "V"]).type;
@@ skipping 24 matching lines @@
     JUnitTestCase.assertSame(functionType, provider.functionType);
     JUnitTestCase.assertSame(intType, provider.intType);
     JUnitTestCase.assertSame(listType, provider.listType);
     JUnitTestCase.assertSame(mapType, provider.mapType);
     JUnitTestCase.assertSame(objectType, provider.objectType);
     JUnitTestCase.assertSame(stackTraceType, provider.stackTraceType);
     JUnitTestCase.assertSame(stringType, provider.stringType);
     JUnitTestCase.assertSame(symbolType, provider.symbolType);
     JUnitTestCase.assertSame(typeType, provider.typeType);
   }
+
   ClassElement classElement(String typeName, InterfaceType superclassType, List<String> parameterNames) {
     ClassElementImpl element = new ClassElementImpl(ASTFactory.identifier3(typeName));
     element.supertype = superclassType;
     InterfaceTypeImpl type = new InterfaceTypeImpl.con1(element);
     element.type = type;
     int count = parameterNames.length;
     if (count > 0) {
       List<TypeParameterElementImpl> typeParameters = new List<TypeParameterElementImpl>(count);
       List<TypeParameterTypeImpl> typeArguments = new List<TypeParameterTypeImpl>(count);
       for (int i = 0; i < count; i++) {
         TypeParameterElementImpl typeParameter = new TypeParameterElementImpl(ASTFactory.identifier3(parameterNames[i]));
         typeParameters[i] = typeParameter;
         typeArguments[i] = new TypeParameterTypeImpl(typeParameter);
         typeParameter.type = typeArguments[i];
       }
       element.typeParameters = typeParameters;
       type.typeArguments = typeArguments;
     }
     return element;
   }
+
   static dartSuite() {
     _ut.group('TypeProviderImplTest', () {
       _ut.test('test_creation', () {
         final __test = new TypeProviderImplTest();
         runJUnitTest(__test, __test.test_creation);
       });
     });
   }
 }
+
 class InheritanceManagerTest extends EngineTestCase {
-
   /**
    * The type provider used to access the types.
    */
   TestTypeProvider _typeProvider;
 
   /**
    * The library containing the code being resolved.
    */
   LibraryElementImpl _definingLibrary;
 
   /**
    * The inheritance manager being tested.
    */
   InheritanceManager _inheritanceManager;
 
   /**
    * The number of members that Object implements (as determined by [TestTypeProvider]).
    */
   int _numOfMembersInObject = 0;
+
   void setUp() {
     _typeProvider = new TestTypeProvider();
     _inheritanceManager = createInheritanceManager();
     InterfaceType objectType = _typeProvider.objectType;
     _numOfMembersInObject = objectType.methods.length + objectType.accessors.length;
   }
+
   void test_getMapOfMembersInheritedFromClasses_accessor_extends() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String getterName = "g";
     PropertyAccessorElement getterG = ElementFactory.getterElement(getterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [getterG];
     ClassElementImpl classB = ElementFactory.classElement("B", classA.type, []);
     MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
     MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
     JUnitTestCase.assertEquals(_numOfMembersInObject, mapA.size);
     JUnitTestCase.assertEquals(_numOfMembersInObject + 1, mapB.size);
     JUnitTestCase.assertSame(getterG, mapB.get(getterName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_getMapOfMembersInheritedFromClasses_accessor_implements() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String getterName = "g";
     PropertyAccessorElement getterG = ElementFactory.getterElement(getterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [getterG];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.interfaces = <InterfaceType> [classA.type];
     MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
     MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
     JUnitTestCase.assertEquals(_numOfMembersInObject, mapA.size);
     JUnitTestCase.assertEquals(_numOfMembersInObject, mapB.size);
     JUnitTestCase.assertNull(mapB.get(getterName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_getMapOfMembersInheritedFromClasses_accessor_with() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String getterName = "g";
     PropertyAccessorElement getterG = ElementFactory.getterElement(getterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [getterG];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.mixins = <InterfaceType> [classA.type];
     MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
     MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
     JUnitTestCase.assertEquals(_numOfMembersInObject, mapA.size);
     JUnitTestCase.assertEquals(_numOfMembersInObject + 1, mapB.size);
     JUnitTestCase.assertSame(getterG, mapB.get(getterName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_getMapOfMembersInheritedFromClasses_method_extends() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
     classA.methods = <MethodElement> [methodM];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.supertype = classA.type;
     MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
     MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
     JUnitTestCase.assertEquals(_numOfMembersInObject, mapA.size);
     JUnitTestCase.assertEquals(_numOfMembersInObject + 1, mapB.size);
     JUnitTestCase.assertSame(methodM, mapB.get(methodName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_getMapOfMembersInheritedFromClasses_method_implements() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
     classA.methods = <MethodElement> [methodM];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.interfaces = <InterfaceType> [classA.type];
     MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
     MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
     JUnitTestCase.assertEquals(_numOfMembersInObject, mapA.size);
     JUnitTestCase.assertEquals(_numOfMembersInObject, mapB.size);
     JUnitTestCase.assertNull(mapB.get(methodName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_getMapOfMembersInheritedFromClasses_method_with() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
     classA.methods = <MethodElement> [methodM];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.mixins = <InterfaceType> [classA.type];
     MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
     MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
     JUnitTestCase.assertEquals(_numOfMembersInObject, mapA.size);
     JUnitTestCase.assertEquals(_numOfMembersInObject + 1, mapB.size);
     JUnitTestCase.assertSame(methodM, mapB.get(methodName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_getMapOfMembersInheritedFromInterfaces_accessor_extends() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String getterName = "g";
     PropertyAccessorElement getterG = ElementFactory.getterElement(getterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [getterG];
     ClassElementImpl classB = ElementFactory.classElement("B", classA.type, []);
     MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
     MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
     JUnitTestCase.assertEquals(_numOfMembersInObject, mapA.size);
     JUnitTestCase.assertEquals(_numOfMembersInObject + 1, mapB.size);
     JUnitTestCase.assertSame(getterG, mapB.get(getterName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_getMapOfMembersInheritedFromInterfaces_accessor_implements() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String getterName = "g";
     PropertyAccessorElement getterG = ElementFactory.getterElement(getterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [getterG];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.interfaces = <InterfaceType> [classA.type];
     MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
     MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
     JUnitTestCase.assertEquals(_numOfMembersInObject, mapA.size);
     JUnitTestCase.assertEquals(_numOfMembersInObject + 1, mapB.size);
     JUnitTestCase.assertSame(getterG, mapB.get(getterName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_getMapOfMembersInheritedFromInterfaces_accessor_with() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String getterName = "g";
     PropertyAccessorElement getterG = ElementFactory.getterElement(getterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [getterG];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.mixins = <InterfaceType> [classA.type];
     MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
     MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
     JUnitTestCase.assertEquals(_numOfMembersInObject, mapA.size);
     JUnitTestCase.assertEquals(_numOfMembersInObject + 1, mapB.size);
     JUnitTestCase.assertSame(getterG, mapB.get(getterName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_getMapOfMembersInheritedFromInterfaces_method_extends() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
     classA.methods = <MethodElement> [methodM];
     ClassElementImpl classB = ElementFactory.classElement("B", classA.type, []);
     MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
     MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
     JUnitTestCase.assertEquals(_numOfMembersInObject, mapA.size);
     JUnitTestCase.assertEquals(_numOfMembersInObject + 1, mapB.size);
     JUnitTestCase.assertSame(methodM, mapB.get(methodName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_getMapOfMembersInheritedFromInterfaces_method_implements() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
     classA.methods = <MethodElement> [methodM];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.interfaces = <InterfaceType> [classA.type];
     MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
     MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
     JUnitTestCase.assertEquals(_numOfMembersInObject, mapA.size);
     JUnitTestCase.assertEquals(_numOfMembersInObject + 1, mapB.size);
     JUnitTestCase.assertSame(methodM, mapB.get(methodName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_getMapOfMembersInheritedFromInterfaces_method_with() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
     classA.methods = <MethodElement> [methodM];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.mixins = <InterfaceType> [classA.type];
     MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
     MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
     JUnitTestCase.assertEquals(_numOfMembersInObject, mapA.size);
     JUnitTestCase.assertEquals(_numOfMembersInObject + 1, mapB.size);
     JUnitTestCase.assertSame(methodM, mapB.get(methodName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupInheritance_interface_getter() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String getterName = "g";
     PropertyAccessorElement getterG = ElementFactory.getterElement(getterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [getterG];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.interfaces = <InterfaceType> [classA.type];
     JUnitTestCase.assertSame(getterG, _inheritanceManager.lookupInheritance(classB, getterName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupInheritance_interface_method() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
     classA.methods = <MethodElement> [methodM];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.interfaces = <InterfaceType> [classA.type];
     JUnitTestCase.assertSame(methodM, _inheritanceManager.lookupInheritance(classB, methodName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupInheritance_interface_setter() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String setterName = "s";
     PropertyAccessorElement setterS = ElementFactory.setterElement(setterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [setterS];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.interfaces = <InterfaceType> [classA.type];
     JUnitTestCase.assertSame(setterS, _inheritanceManager.lookupInheritance(classB, "${setterName}="));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupInheritance_interface_staticMember() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
-    ((methodM as MethodElementImpl)).static = true;
+    (methodM as MethodElementImpl).static = true;
     classA.methods = <MethodElement> [methodM];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.interfaces = <InterfaceType> [classA.type];
     JUnitTestCase.assertNull(_inheritanceManager.lookupInheritance(classB, methodName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupInheritance_interfaces_infiniteLoop() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     classA.interfaces = <InterfaceType> [classA.type];
     JUnitTestCase.assertNull(_inheritanceManager.lookupInheritance(classA, "name"));
     assertNoErrors(classA);
   }
+
   void test_lookupInheritance_interfaces_infiniteLoop2() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classA.interfaces = <InterfaceType> [classB.type];
     classB.interfaces = <InterfaceType> [classA.type];
     JUnitTestCase.assertNull(_inheritanceManager.lookupInheritance(classA, "name"));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupInheritance_interfaces_STWC_inconsistentMethodInheritance() {
     ClassElementImpl classI1 = ElementFactory.classElement2("I1", []);
     String methodName = "m";
     MethodElement methodM1 = ElementFactory.methodElement(methodName, null, [_typeProvider.intType]);
     classI1.methods = <MethodElement> [methodM1];
     ClassElementImpl classI2 = ElementFactory.classElement2("I2", []);
     MethodElement methodM2 = ElementFactory.methodElement(methodName, null, [_typeProvider.stringType]);
     classI2.methods = <MethodElement> [methodM2];
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     classA.interfaces = <InterfaceType> [classI1.type, classI2.type];
     JUnitTestCase.assertNull(_inheritanceManager.lookupInheritance(classA, methodName));
     assertNoErrors(classI1);
     assertNoErrors(classI2);
     assertErrors(classA, [StaticTypeWarningCode.INCONSISTENT_METHOD_INHERITANCE]);
   }
+
   void test_lookupInheritance_interfaces_SWC_inconsistentMethodInheritance() {
     ClassElementImpl classI1 = ElementFactory.classElement2("I1", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
     classI1.methods = <MethodElement> [methodM];
     ClassElementImpl classI2 = ElementFactory.classElement2("I2", []);
     PropertyAccessorElement getter = ElementFactory.getterElement(methodName, false, _typeProvider.intType);
     classI2.accessors = <PropertyAccessorElement> [getter];
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     classA.interfaces = <InterfaceType> [classI1.type, classI2.type];
     JUnitTestCase.assertNull(_inheritanceManager.lookupInheritance(classA, methodName));
     assertNoErrors(classI1);
     assertNoErrors(classI2);
     assertErrors(classA, [StaticWarningCode.INCONSISTENT_METHOD_INHERITANCE_GETTER_AND_METHOD]);
   }
+
   void test_lookupInheritance_interfaces_union1() {
     ClassElementImpl classI1 = ElementFactory.classElement2("I1", []);
     String methodName1 = "m1";
     MethodElement methodM1 = ElementFactory.methodElement(methodName1, _typeProvider.intType, []);
     classI1.methods = <MethodElement> [methodM1];
     ClassElementImpl classI2 = ElementFactory.classElement2("I2", []);
     String methodName2 = "m2";
     MethodElement methodM2 = ElementFactory.methodElement(methodName2, _typeProvider.intType, []);
     classI2.methods = <MethodElement> [methodM2];
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     classA.interfaces = <InterfaceType> [classI1.type, classI2.type];
     JUnitTestCase.assertSame(methodM1, _inheritanceManager.lookupInheritance(classA, methodName1));
     JUnitTestCase.assertSame(methodM2, _inheritanceManager.lookupInheritance(classA, methodName2));
     assertNoErrors(classI1);
     assertNoErrors(classI2);
     assertNoErrors(classA);
   }
+
   void test_lookupInheritance_interfaces_union2() {
     ClassElementImpl classI1 = ElementFactory.classElement2("I1", []);
     String methodName1 = "m1";
     MethodElement methodM1 = ElementFactory.methodElement(methodName1, _typeProvider.intType, []);
     classI1.methods = <MethodElement> [methodM1];
     ClassElementImpl classI2 = ElementFactory.classElement2("I2", []);
     String methodName2 = "m2";
     MethodElement methodM2 = ElementFactory.methodElement(methodName2, _typeProvider.intType, []);
     classI2.methods = <MethodElement> [methodM2];
     classI2.interfaces = <InterfaceType> [classI1.type];
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     classA.interfaces = <InterfaceType> [classI2.type];
     JUnitTestCase.assertSame(methodM1, _inheritanceManager.lookupInheritance(classA, methodName1));
     JUnitTestCase.assertSame(methodM2, _inheritanceManager.lookupInheritance(classA, methodName2));
     assertNoErrors(classI1);
     assertNoErrors(classI2);
     assertNoErrors(classA);
   }
+
   void test_lookupInheritance_mixin_getter() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String getterName = "g";
     PropertyAccessorElement getterG = ElementFactory.getterElement(getterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [getterG];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.mixins = <InterfaceType> [classA.type];
     JUnitTestCase.assertSame(getterG, _inheritanceManager.lookupInheritance(classB, getterName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupInheritance_mixin_method() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
     classA.methods = <MethodElement> [methodM];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.mixins = <InterfaceType> [classA.type];
     JUnitTestCase.assertSame(methodM, _inheritanceManager.lookupInheritance(classB, methodName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupInheritance_mixin_setter() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String setterName = "s";
     PropertyAccessorElement setterS = ElementFactory.setterElement(setterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [setterS];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.mixins = <InterfaceType> [classA.type];
     JUnitTestCase.assertSame(setterS, _inheritanceManager.lookupInheritance(classB, "${setterName}="));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupInheritance_mixin_staticMember() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
-    ((methodM as MethodElementImpl)).static = true;
+    (methodM as MethodElementImpl).static = true;
     classA.methods = <MethodElement> [methodM];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.mixins = <InterfaceType> [classA.type];
     JUnitTestCase.assertNull(_inheritanceManager.lookupInheritance(classB, methodName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupInheritance_noMember() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     JUnitTestCase.assertNull(_inheritanceManager.lookupInheritance(classA, "a"));
     assertNoErrors(classA);
   }
+
   void test_lookupInheritance_superclass_getter() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String getterName = "g";
     PropertyAccessorElement getterG = ElementFactory.getterElement(getterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [getterG];
     ClassElementImpl classB = ElementFactory.classElement("B", classA.type, []);
     JUnitTestCase.assertSame(getterG, _inheritanceManager.lookupInheritance(classB, getterName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupInheritance_superclass_infiniteLoop() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     classA.supertype = classA.type;
     JUnitTestCase.assertNull(_inheritanceManager.lookupInheritance(classA, "name"));
     assertNoErrors(classA);
   }
+
   void test_lookupInheritance_superclass_infiniteLoop2() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classA.supertype = classB.type;
     classB.supertype = classA.type;
     JUnitTestCase.assertNull(_inheritanceManager.lookupInheritance(classA, "name"));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupInheritance_superclass_method() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
     classA.methods = <MethodElement> [methodM];
     ClassElementImpl classB = ElementFactory.classElement("B", classA.type, []);
     JUnitTestCase.assertSame(methodM, _inheritanceManager.lookupInheritance(classB, methodName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupInheritance_superclass_setter() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String setterName = "s";
     PropertyAccessorElement setterS = ElementFactory.setterElement(setterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [setterS];
     ClassElementImpl classB = ElementFactory.classElement("B", classA.type, []);
     JUnitTestCase.assertSame(setterS, _inheritanceManager.lookupInheritance(classB, "${setterName}="));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupInheritance_superclass_staticMember() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
-    ((methodM as MethodElementImpl)).static = true;
+    (methodM as MethodElementImpl).static = true;
     classA.methods = <MethodElement> [methodM];
     ClassElementImpl classB = ElementFactory.classElement("B", classA.type, []);
     JUnitTestCase.assertNull(_inheritanceManager.lookupInheritance(classB, methodName));
     assertNoErrors(classA);
     assertNoErrors(classB);
   }
+
   void test_lookupMember_getter() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String getterName = "g";
     PropertyAccessorElement getterG = ElementFactory.getterElement(getterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [getterG];
     JUnitTestCase.assertSame(getterG, _inheritanceManager.lookupMember(classA, getterName));
     assertNoErrors(classA);
   }
+
   void test_lookupMember_getter_static() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String getterName = "g";
     PropertyAccessorElement getterG = ElementFactory.getterElement(getterName, true, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [getterG];
     JUnitTestCase.assertNull(_inheritanceManager.lookupMember(classA, getterName));
     assertNoErrors(classA);
   }
+
   void test_lookupMember_method() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
     classA.methods = <MethodElement> [methodM];
     JUnitTestCase.assertSame(methodM, _inheritanceManager.lookupMember(classA, methodName));
     assertNoErrors(classA);
   }
+
   void test_lookupMember_method_static() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);
-    ((methodM as MethodElementImpl)).static = true;
+    (methodM as MethodElementImpl).static = true;
     classA.methods = <MethodElement> [methodM];
     JUnitTestCase.assertNull(_inheritanceManager.lookupMember(classA, methodName));
     assertNoErrors(classA);
   }
+
   void test_lookupMember_noMember() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     JUnitTestCase.assertNull(_inheritanceManager.lookupMember(classA, "a"));
     assertNoErrors(classA);
   }
+
   void test_lookupMember_setter() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String setterName = "s";
     PropertyAccessorElement setterS = ElementFactory.setterElement(setterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [setterS];
     JUnitTestCase.assertSame(setterS, _inheritanceManager.lookupMember(classA, "${setterName}="));
     assertNoErrors(classA);
   }
+
   void test_lookupMember_setter_static() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String setterName = "s";
     PropertyAccessorElement setterS = ElementFactory.setterElement(setterName, true, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [setterS];
     JUnitTestCase.assertNull(_inheritanceManager.lookupMember(classA, setterName));
     assertNoErrors(classA);
   }
+
   void assertErrors(ClassElement classElt, List<ErrorCode> expectedErrorCodes) {
     GatheringErrorListener errorListener = new GatheringErrorListener();
     Set<AnalysisError> actualErrors = _inheritanceManager.getErrors(classElt);
     if (actualErrors != null) {
       for (AnalysisError error in actualErrors) {
         errorListener.onError(error);
       }
     }
     errorListener.assertErrors2(expectedErrorCodes);
   }
+
   void assertNoErrors(ClassElement classElt) {
     assertErrors(classElt, []);
   }
 
   /**
    * Create the inheritance manager used by the tests.
    *
    * @return the inheritance manager that was created
    */
   InheritanceManager createInheritanceManager() {
     AnalysisContextImpl context = AnalysisContextFactory.contextWithCore();
     FileBasedSource source = new FileBasedSource.con1(new ContentCache(), FileUtilities2.createFile("/test.dart"));
     CompilationUnitElementImpl definingCompilationUnit = new CompilationUnitElementImpl("test.dart");
     definingCompilationUnit.source = source;
     _definingLibrary = ElementFactory.library(context, "test");
     _definingLibrary.definingCompilationUnit = definingCompilationUnit;
     return new InheritanceManager(_definingLibrary);
   }
+
   static dartSuite() {
     _ut.group('InheritanceManagerTest', () {
       _ut.test('test_getMapOfMembersInheritedFromClasses_accessor_extends', () {
         final __test = new InheritanceManagerTest();
         runJUnitTest(__test, __test.test_getMapOfMembersInheritedFromClasses_accessor_extends);
       });
       _ut.test('test_getMapOfMembersInheritedFromClasses_accessor_implements', () {
         final __test = new InheritanceManagerTest();
         runJUnitTest(__test, __test.test_getMapOfMembersInheritedFromClasses_accessor_implements);
       });
@@ skipping 145 matching lines @@
         final __test = new InheritanceManagerTest();
         runJUnitTest(__test, __test.test_lookupMember_setter);
       });
       _ut.test('test_lookupMember_setter_static', () {
         final __test = new InheritanceManagerTest();
         runJUnitTest(__test, __test.test_lookupMember_setter_static);
       });
     });
   }
 }
+
 class CompileTimeErrorCodeTest extends ResolverTestCase {
   void fail_compileTimeConstantRaisesException() {
     Source source = addSource(EngineTestCase.createSource([]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.COMPILE_TIME_CONSTANT_RAISES_EXCEPTION]);
     verify([source]);
   }
+
   void fail_constEvalThrowsException() {
     Source source = addSource(EngineTestCase.createSource([
         "class C {",
         "  const C();",
         "}",
         "f() { return const C(); }"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_CONSTRUCTOR_THROWS_EXCEPTION]);
     verify([source]);
   }
+
   void fail_mixinDeclaresConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A() {}",
         "}",
         "class B extends Object mixin A {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_DECLARES_CONSTRUCTOR]);
     verify([source]);
   }
+
   void fail_mixinOfNonClass() {
     Source source = addSource(EngineTestCase.createSource(["var A;", "class B extends Object mixin A {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_OF_NON_CLASS]);
     verify([source]);
   }
+
   void fail_objectCannotExtendAnotherClass() {
     Source source = addSource(EngineTestCase.createSource([]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.OBJECT_CANNOT_EXTEND_ANOTHER_CLASS]);
     verify([source]);
   }
+
   void fail_recursiveCompileTimeConstant() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "  final m = const A();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.RECURSIVE_COMPILE_TIME_CONSTANT]);
     verify([source]);
   }
+
   void fail_recursiveCompileTimeConstant_cycle() {
     Source source = addSource(EngineTestCase.createSource(["const x = y + 1;", "const y = x + 1;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.RECURSIVE_COMPILE_TIME_CONSTANT]);
     verify([source]);
   }
+
   void fail_superInitializerInObject() {
     Source source = addSource(EngineTestCase.createSource([]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.SUPER_INITIALIZER_IN_OBJECT]);
     verify([source]);
   }
+
   void test_ambiguousExport() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "export 'lib1.dart';",
         "export 'lib2.dart';"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class N {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "class N {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.AMBIGUOUS_EXPORT]);
     verify([source]);
   }
+
   void test_ambiguousImport_function() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "import 'lib2.dart';",
         "g() { return f(); }"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "f() {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "f() {}"]));
     resolve(source);
     assertErrors(source, [
         StaticWarningCode.AMBIGUOUS_IMPORT,
         CompileTimeErrorCode.UNDEFINED_FUNCTION]);
   }
+
   void test_argumentDefinitionTestNonParameter() {
     Source source = addSource(EngineTestCase.createSource(["f() {", " var v = 0;", " return ?v;", "}"]));
     resolve(source);
     assertErrors(source, [
         ParserErrorCode.DEPRECATED_ARGUMENT_DEFINITION_TEST,
         CompileTimeErrorCode.ARGUMENT_DEFINITION_TEST_NON_PARAMETER]);
     verify([source]);
   }
+
   void test_builtInIdentifierAsMixinName_classTypeAlias() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "class B {}", "class as = A with B;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_TYPEDEF_NAME]);
     verify([source]);
   }
+
   void test_builtInIdentifierAsType_formalParameter_field() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  var x;", "  A(static this.x);", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_TYPE]);
     verify([source]);
   }
+
   void test_builtInIdentifierAsType_formalParameter_simple() {
     Source source = addSource(EngineTestCase.createSource(["f(static x) {", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_TYPE]);
     verify([source]);
   }
+
   void test_builtInIdentifierAsType_variableDeclaration() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  typedef x;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_TYPE]);
     verify([source]);
   }
+
   void test_builtInIdentifierAsTypedefName_functionTypeAlias() {
     Source source = addSource(EngineTestCase.createSource(["typedef bool as();"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_TYPEDEF_NAME]);
     verify([source]);
   }
+
   void test_builtInIdentifierAsTypeName() {
     Source source = addSource(EngineTestCase.createSource(["class as {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_TYPE_NAME]);
     verify([source]);
   }
+
   void test_builtInIdentifierAsTypeParameterName() {
     Source source = addSource(EngineTestCase.createSource(["class A<as> {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.BUILT_IN_IDENTIFIER_AS_TYPE_PARAMETER_NAME]);
     verify([source]);
   }
+
   void test_caseExpressionTypeImplementsEquals() {
     Source source = addSource(EngineTestCase.createSource([
         "class IntWrapper {",
         "  final int value;",
         "  const IntWrapper(this.value);",
         "  bool operator ==(IntWrapper x) {",
         "    return value == x.value;",
         "  }",
         "  get hashCode => value;",
         "}",
         "",
         "f(var a) {",
         "  switch(a) {",
         "    case(const IntWrapper(1)) : return 1;",
         "    default: return 0;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CASE_EXPRESSION_TYPE_IMPLEMENTS_EQUALS]);
     verify([source]);
   }
+
   void test_conflictingConstructorNameAndMember_field() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x;", "  A.x() {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONFLICTING_CONSTRUCTOR_NAME_AND_FIELD]);
     verify([source]);
   }
+
   void test_conflictingConstructorNameAndMember_method() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  const A.x();", "  void x() {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONFLICTING_CONSTRUCTOR_NAME_AND_METHOD]);
     verify([source]);
   }
+
   void test_conflictingGetterAndMethod_field_method() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
-        "  int m;",
+        "  final int m = 0;",
         "}",
         "class B extends A {",
         "  m() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONFLICTING_GETTER_AND_METHOD]);
     verify([source]);
   }
+
   void test_conflictingGetterAndMethod_getter_method() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  get m => 0;",
         "}",
         "class B extends A {",
         "  m() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONFLICTING_GETTER_AND_METHOD]);
     verify([source]);
   }
+
   void test_conflictingGetterAndMethod_method_field() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m() {}",
         "}",
         "class B extends A {",
         "  int m;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONFLICTING_METHOD_AND_GETTER]);
     verify([source]);
   }
+
   void test_conflictingGetterAndMethod_method_getter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m() {}",
         "}",
         "class B extends A {",
         "  get m => 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONFLICTING_METHOD_AND_GETTER]);
     verify([source]);
   }
+
   void test_conflictingTypeVariableAndClass() {
     Source source = addSource(EngineTestCase.createSource(["class T<T> {", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONFLICTING_TYPE_VARIABLE_AND_CLASS]);
     verify([source]);
   }
+
   void test_conflictingTypeVariableAndMember_field() {
     Source source = addSource(EngineTestCase.createSource(["class A<T> {", "  var T;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONFLICTING_TYPE_VARIABLE_AND_MEMBER]);
     verify([source]);
   }
+
   void test_conflictingTypeVariableAndMember_getter() {
     Source source = addSource(EngineTestCase.createSource(["class A<T> {", "  get T => null;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONFLICTING_TYPE_VARIABLE_AND_MEMBER]);
     verify([source]);
   }
+
   void test_conflictingTypeVariableAndMember_method() {
     Source source = addSource(EngineTestCase.createSource(["class A<T> {", "  T() {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONFLICTING_TYPE_VARIABLE_AND_MEMBER]);
     verify([source]);
   }
+
   void test_conflictingTypeVariableAndMember_method_static() {
     Source source = addSource(EngineTestCase.createSource(["class A<T> {", "  static T() {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONFLICTING_TYPE_VARIABLE_AND_MEMBER]);
     verify([source]);
   }
+
   void test_conflictingTypeVariableAndMember_setter() {
     Source source = addSource(EngineTestCase.createSource(["class A<T> {", "  set T(x) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONFLICTING_TYPE_VARIABLE_AND_MEMBER]);
     verify([source]);
   }
+
   void test_constConstructorWithNonConstSuper_explicit() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A();",
         "}",
         "class B extends A {",
         "  const B(): super();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_CONSTRUCTOR_WITH_NON_CONST_SUPER]);
     verify([source]);
   }
+
   void test_constConstructorWithNonConstSuper_implicit() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A();",
         "}",
         "class B extends A {",
         "  const B();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_CONSTRUCTOR_WITH_NON_CONST_SUPER]);
     verify([source]);
   }
+
   void test_constConstructorWithNonFinalField_mixin() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var a;",
         "}",
         "class B extends Object with A {",
         "  const B();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_CONSTRUCTOR_WITH_NON_FINAL_FIELD]);
     verify([source]);
   }
+
   void test_constConstructorWithNonFinalField_super() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var a;",
         "}",
         "class B extends A {",
         "  const B();",
         "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.CONST_CONSTRUCTOR_WITH_NON_FINAL_FIELD,
         CompileTimeErrorCode.CONST_CONSTRUCTOR_WITH_NON_CONST_SUPER]);
     verify([source]);
   }
+
   void test_constConstructorWithNonFinalField_this() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x;", "  const A();", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_CONSTRUCTOR_WITH_NON_FINAL_FIELD]);
     verify([source]);
   }
+
   void test_constEval_newInstance_constConstructor() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  const A();", "}", "const a = new A();"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE]);
     verify([source]);
   }
+
   void test_constEval_propertyExtraction_targetNotConst() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "  m() {}",
         "}",
         "final a = const A();",
         "const C = a.m;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE]);
     verify([source]);
   }
+
   void test_constEvalThrowsException_binaryMinus_null() {
     check_constEvalThrowsException_binary_null("null - 5", false);
     check_constEvalThrowsException_binary_null("5 - null", true);
   }
+
   void test_constEvalThrowsException_binaryPlus_null() {
     check_constEvalThrowsException_binary_null("null + 5", false);
     check_constEvalThrowsException_binary_null("5 + null", true);
   }
+
   void test_constEvalThrowsException_divisionByZero() {
     Source source = addSource("const C = 1 ~/ 0;");
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_EVAL_THROWS_IDBZE]);
     verify([source]);
   }
+
   void test_constEvalThrowsException_unaryBitNot_null() {
     Source source = addSource("const C = ~null;");
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_EVAL_THROWS_EXCEPTION]);
   }
+
   void test_constEvalThrowsException_unaryNegated_null() {
     Source source = addSource("const C = -null;");
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_EVAL_THROWS_EXCEPTION]);
   }
+
   void test_constEvalThrowsException_unaryNot_null() {
     Source source = addSource("const C = !null;");
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_EVAL_THROWS_EXCEPTION]);
     verify([source]);
   }
+
   void test_constEvalTypeBool_binary() {
     check_constEvalTypeBool_withParameter_binary("p && ''");
     check_constEvalTypeBool_withParameter_binary("p || ''");
   }
+
   void test_constEvalTypeBool_binary_leftTrue() {
     Source source = addSource("const C = (true || 0);");
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.CONST_EVAL_TYPE_BOOL,
         HintCode.DEAD_CODE]);
     verify([source]);
   }
+
   void test_constEvalTypeBoolNumString_equal() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "}",
         "class B {",
         "  final a;",
         "  const B(num p) : a = p == const A();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_EVAL_TYPE_BOOL_NUM_STRING]);
     verify([source]);
   }
+
   void test_constEvalTypeBoolNumString_notEqual() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "}",
         "class B {",
         "  final a;",
         "  const B(String p) : a = p != const A();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_EVAL_TYPE_BOOL_NUM_STRING]);
     verify([source]);
   }
+
   void test_constEvalTypeInt_binary() {
     check_constEvalTypeInt_withParameter_binary("p ^ ''");
     check_constEvalTypeInt_withParameter_binary("p & ''");
     check_constEvalTypeInt_withParameter_binary("p | ''");
     check_constEvalTypeInt_withParameter_binary("p >> ''");
     check_constEvalTypeInt_withParameter_binary("p << ''");
   }
+
   void test_constEvalTypeNum_binary() {
     check_constEvalTypeNum_withParameter_binary("p + ''");
     check_constEvalTypeNum_withParameter_binary("p - ''");
     check_constEvalTypeNum_withParameter_binary("p * ''");
     check_constEvalTypeNum_withParameter_binary("p / ''");
     check_constEvalTypeNum_withParameter_binary("p ~/ ''");
     check_constEvalTypeNum_withParameter_binary("p > ''");
     check_constEvalTypeNum_withParameter_binary("p < ''");
     check_constEvalTypeNum_withParameter_binary("p >= ''");
     check_constEvalTypeNum_withParameter_binary("p <= ''");
     check_constEvalTypeNum_withParameter_binary("p % ''");
   }
+
   void test_constEvalTypeNum_plus_String() {
     Source source = addSource("const C = 'a' + 'b';");
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_EVAL_TYPE_NUM]);
     verify([source]);
   }
+
   void test_constFormalParameter_fieldFormalParameter() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  var x;", "  A(const this.x) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_FORMAL_PARAMETER]);
     verify([source]);
   }
+
   void test_constFormalParameter_simpleFormalParameter() {
     Source source = addSource(EngineTestCase.createSource(["f(const x) {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_FORMAL_PARAMETER]);
     verify([source]);
   }
+
   void test_constInitializedWithNonConstValue() {
     Source source = addSource(EngineTestCase.createSource(["f(p) {", "  const C = p;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE]);
     verify([source]);
   }
+
   void test_constInitializedWithNonConstValue_missingConstInListLiteral() {
     Source source = addSource("const List L = [0];");
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE]);
     verify([source]);
   }
+
   void test_constInitializedWithNonConstValue_missingConstInMapLiteral() {
     Source source = addSource("const Map M = {'a' : 0};");
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE]);
     verify([source]);
   }
+
   void test_constInstanceField() {
     Source source = addSource(EngineTestCase.createSource(["class C {", "  const int f = 0;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_INSTANCE_FIELD]);
     verify([source]);
   }
+
   void test_constMapKeyTypeImplementsEquals_direct() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "  operator ==(other) => false;",
         "}",
         "main() {",
         "  const {const A() : 0};",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_MAP_KEY_EXPRESSION_TYPE_IMPLEMENTS_EQUALS]);
     verify([source]);
   }
+
   void test_constMapKeyTypeImplementsEquals_super() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "  operator ==(other) => false;",
         "}",
         "class B extends A {",
         "  const B();",
         "}",
         "main() {",
         "  const {const B() : 0};",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_MAP_KEY_EXPRESSION_TYPE_IMPLEMENTS_EQUALS]);
     verify([source]);
   }
+
   void test_constWithInvalidTypeParameters() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "}",
         "f() { return const A<A>(); }"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_WITH_INVALID_TYPE_PARAMETERS]);
     verify([source]);
   }
+
   void test_constWithInvalidTypeParameters_tooFew() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class C<K, V> {",
         "  const C();",
         "}",
         "f(p) {",
         "  return const C<A>();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_WITH_INVALID_TYPE_PARAMETERS]);
     verify([source]);
   }
+
   void test_constWithInvalidTypeParameters_tooMany() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class C<E> {",
         "  const C();",
         "}",
         "f(p) {",
         "  return const C<A, A>();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_WITH_INVALID_TYPE_PARAMETERS]);
     verify([source]);
   }
+
   void test_constWithNonConst() {
     Source source = addSource(EngineTestCase.createSource([
         "class T {",
         "  T(a, b, {c, d}) {}",
         "}",
         "f() { return const T(0, 1, c: 2, d: 3); }"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_WITH_NON_CONST]);
     verify([source]);
   }
+
   void test_constWithNonConstantArgument_annotation() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A(int p);",
         "}",
         "var v = 42;",
         "@A(v)",
         "main() {",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_WITH_NON_CONSTANT_ARGUMENT]);
     verify([source]);
   }
+
   void test_constWithNonConstantArgument_instanceCreation() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A(a);",
         "}",
         "f(p) { return const A(p); }"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_WITH_NON_CONSTANT_ARGUMENT]);
     verify([source]);
   }
+
   void test_constWithNonType() {
     Source source = addSource(EngineTestCase.createSource(["int A;", "f() {", "  return const A();", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_WITH_NON_TYPE]);
     verify([source]);
   }
+
   void test_constWithNonType_fromLibrary() {
     Source source1 = addSource2("lib.dart", "");
     Source source2 = addSource2("lib2.dart", EngineTestCase.createSource([
         "import 'lib.dart' as lib;",
         "void f() {",
         "  const lib.A();",
         "}"]));
     resolve(source1);
     resolve(source2);
     assertErrors(source2, [CompileTimeErrorCode.CONST_WITH_NON_TYPE]);
     verify([source1]);
   }
+
   void test_constWithTypeParameters_direct() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<T> {",
         "  static const V = const A<T>();",
         "  const A();",
         "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.CONST_WITH_TYPE_PARAMETERS,
         StaticWarningCode.TYPE_PARAMETER_REFERENCED_BY_STATIC]);
     verify([source]);
   }
+
   void test_constWithTypeParameters_indirect() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<T> {",
         "  static const V = const A<List<T>>();",
         "  const A();",
         "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.CONST_WITH_TYPE_PARAMETERS,
         StaticWarningCode.TYPE_PARAMETER_REFERENCED_BY_STATIC]);
     verify([source]);
   }
+
   void test_constWithUndefinedConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "}",
         "f() {",
         "  return const A.noSuchConstructor();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_WITH_UNDEFINED_CONSTRUCTOR]);
   }
+
   void test_constWithUndefinedConstructorDefault() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A.name();",
         "}",
         "f() {",
         "  return const A();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_WITH_UNDEFINED_CONSTRUCTOR_DEFAULT]);
     verify([source]);
   }
+
   void test_defaultValueInFunctionTypeAlias() {
     Source source = addSource(EngineTestCase.createSource(["typedef F([x = 0]);"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DEFAULT_VALUE_IN_FUNCTION_TYPE_ALIAS]);
     verify([source]);
   }
+
   void test_defaultValueInFunctionTypedParameter_named() {
     Source source = addSource(EngineTestCase.createSource(["f(g({p: null})) {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DEFAULT_VALUE_IN_FUNCTION_TYPED_PARAMETER]);
     verify([source]);
   }
+
   void test_defaultValueInFunctionTypedParameter_optional() {
     Source source = addSource(EngineTestCase.createSource(["f(g([p = null])) {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DEFAULT_VALUE_IN_FUNCTION_TYPED_PARAMETER]);
     verify([source]);
   }
+
   void test_defaultValueInRedirectingFactoryConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  factory A([int x = 0]) = B;",
         "}",
         "",
         "class B implements A {",
         "  B([int x = 1]) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DEFAULT_VALUE_IN_REDIRECTING_FACTORY_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_duplicateConstructorName_named() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A.a() {}", "  A.a() {}", "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.DUPLICATE_CONSTRUCTOR_NAME,
         CompileTimeErrorCode.DUPLICATE_CONSTRUCTOR_NAME]);
     verify([source]);
   }
+
   void test_duplicateConstructorName_unnamed() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A() {}", "  A() {}", "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.DUPLICATE_CONSTRUCTOR_DEFAULT,
         CompileTimeErrorCode.DUPLICATE_CONSTRUCTOR_DEFAULT]);
     verify([source]);
   }
+
   void test_duplicateDefinition() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  int m = 0;", "  m(a) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DUPLICATE_DEFINITION]);
     verify([source]);
   }
+
   void test_duplicateDefinition_acrossLibraries() {
     Source librarySource = addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "", "part 'a.dart';", "part 'b.dart';"]));
     Source sourceA = addSource2("/a.dart", EngineTestCase.createSource(["part of lib;", "", "class A {}"]));
     Source sourceB = addSource2("/b.dart", EngineTestCase.createSource(["part of lib;", "", "class A {}"]));
     resolve(librarySource);
     assertErrors(sourceB, [CompileTimeErrorCode.DUPLICATE_DEFINITION]);
     verify([librarySource, sourceA, sourceB]);
   }
+
   void test_duplicateDefinition_classMembers_fields() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int a;", "  int a;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DUPLICATE_DEFINITION]);
     verify([source]);
   }
+
   void test_duplicateDefinition_classMembers_fields_oneStatic() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x;", "  static int x;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DUPLICATE_DEFINITION]);
     verify([source]);
   }
+
   void test_duplicateDefinition_classMembers_methods() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  m() {}", "  m() {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DUPLICATE_DEFINITION]);
     verify([source]);
   }
+
   void test_duplicateDefinition_localFields() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m() {",
         "    int a;",
         "    int a;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DUPLICATE_DEFINITION]);
     verify([source]);
   }
+
   void test_duplicateDefinition_parameterWithFunctionName_local() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  f(f) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DUPLICATE_DEFINITION]);
     verify([source]);
   }
+
   void test_duplicateDefinition_parameterWithFunctionName_topLevel() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  f(f) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DUPLICATE_DEFINITION]);
     verify([source]);
   }
+
   void test_duplicateDefinitionInheritance_instanceGetter_staticGetter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int get x => 0;",
         "}",
         "class B extends A {",
         "  static int get x => 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DUPLICATE_DEFINITION_INHERITANCE]);
     verify([source]);
   }
+
   void test_duplicateDefinitionInheritance_instanceGetterAbstract_staticGetter() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  int get x;",
         "}",
         "class B extends A {",
         "  static int get x => 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DUPLICATE_DEFINITION_INHERITANCE]);
     verify([source]);
   }
+
   void test_duplicateDefinitionInheritance_instanceMethod_staticMethod() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  x() {}",
         "}",
         "class B extends A {",
         "  static x() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DUPLICATE_DEFINITION_INHERITANCE]);
     verify([source]);
   }
+
   void test_duplicateDefinitionInheritance_instanceMethodAbstract_staticMethod() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  x();",
         "}",
         "abstract class B extends A {",
         "  static x() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DUPLICATE_DEFINITION_INHERITANCE]);
     verify([source]);
   }
+
   void test_duplicateDefinitionInheritance_instanceSetter_staticSetter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  set x(value) {}",
         "}",
         "class B extends A {",
         "  static set x(value) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DUPLICATE_DEFINITION_INHERITANCE]);
     verify([source]);
   }
+
   void test_duplicateDefinitionInheritance_instanceSetterAbstract_staticSetter() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  set x(value);",
         "}",
         "class B extends A {",
         "  static set x(value) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DUPLICATE_DEFINITION_INHERITANCE]);
     verify([source]);
   }
+
   void test_duplicateNamedArgument() {
     Source source = addSource(EngineTestCase.createSource(["f({a, b}) {}", "main() {", "  f(a: 1, a: 2);", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.DUPLICATE_NAMED_ARGUMENT]);
     verify([source]);
   }
+
   void test_exportInternalLibrary() {
     Source source = addSource(EngineTestCase.createSource(["export 'dart:_interceptors';"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.EXPORT_INTERNAL_LIBRARY]);
     verify([source]);
   }
+
   void test_exportOfNonLibrary() {
     Source source = addSource(EngineTestCase.createSource(["library L;", "export 'lib1.dart';"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["part of lib;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.EXPORT_OF_NON_LIBRARY]);
     verify([source]);
   }
+
   void test_extendsDisallowedClass_bool() {
     Source source = addSource(EngineTestCase.createSource(["class A extends bool {}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.EXTENDS_DISALLOWED_CLASS,
         CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_IMPLICIT]);
     verify([source]);
   }
+
   void test_extendsDisallowedClass_double() {
     Source source = addSource(EngineTestCase.createSource(["class A extends double {}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.EXTENDS_DISALLOWED_CLASS,
         CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_IMPLICIT]);
     verify([source]);
   }
+
   void test_extendsDisallowedClass_int() {
     Source source = addSource(EngineTestCase.createSource(["class A extends int {}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.EXTENDS_DISALLOWED_CLASS,
         CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_IMPLICIT]);
     verify([source]);
   }
+
   void test_extendsDisallowedClass_Null() {
     Source source = addSource(EngineTestCase.createSource(["class A extends Null {}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.EXTENDS_DISALLOWED_CLASS,
         CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_IMPLICIT]);
     verify([source]);
   }
+
   void test_extendsDisallowedClass_num() {
     Source source = addSource(EngineTestCase.createSource(["class A extends num {}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.EXTENDS_DISALLOWED_CLASS,
         CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_IMPLICIT]);
     verify([source]);
   }
+
   void test_extendsDisallowedClass_String() {
     Source source = addSource(EngineTestCase.createSource(["class A extends String {}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.EXTENDS_DISALLOWED_CLASS,
         CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_IMPLICIT]);
     verify([source]);
   }
+
   void test_extendsNonClass_class() {
     Source source = addSource(EngineTestCase.createSource(["int A;", "class B extends A {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.EXTENDS_NON_CLASS]);
     verify([source]);
   }
+
   void test_extendsNonClass_dynamic() {
     Source source = addSource(EngineTestCase.createSource(["class B extends dynamic {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.EXTENDS_NON_CLASS]);
     verify([source]);
   }
+
   void test_extraPositionalArguments_const() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "}",
         "main() {",
         "  const A(0);",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.EXTRA_POSITIONAL_ARGUMENTS]);
     verify([source]);
   }
+
   void test_extraPositionalArguments_const_super() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "}",
         "class B extends A {",
         "  const B() : super(0);",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.EXTRA_POSITIONAL_ARGUMENTS]);
     verify([source]);
   }
+
   void test_fieldInitializedByMultipleInitializers() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x;", "  A() : x = 0, x = 1 {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.FIELD_INITIALIZED_BY_MULTIPLE_INITIALIZERS]);
     verify([source]);
   }
+
   void test_fieldInitializedByMultipleInitializers_multipleInits() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int x;",
         "  A() : x = 0, x = 1, x = 2 {}",
         "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.FIELD_INITIALIZED_BY_MULTIPLE_INITIALIZERS,
         CompileTimeErrorCode.FIELD_INITIALIZED_BY_MULTIPLE_INITIALIZERS]);
     verify([source]);
   }
+
   void test_fieldInitializedByMultipleInitializers_multipleNames() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int x;",
         "  int y;",
         "  A() : x = 0, x = 1, y = 0, y = 1 {}",
         "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.FIELD_INITIALIZED_BY_MULTIPLE_INITIALIZERS,
         CompileTimeErrorCode.FIELD_INITIALIZED_BY_MULTIPLE_INITIALIZERS]);
     verify([source]);
   }
+
   void test_fieldInitializedInParameterAndInitializer() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x;", "  A(this.x) : x = 1 {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.FIELD_INITIALIZED_IN_PARAMETER_AND_INITIALIZER]);
     verify([source]);
   }
+
   void test_fieldInitializerFactoryConstructor() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x;", "  factory A(this.x) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.FIELD_INITIALIZER_FACTORY_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_fieldInitializerNotAssignable() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final int x;",
         "  const A() : x = '';",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_FIELD_INITIALIZER_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_fieldInitializerOutsideConstructor() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x;", "  m(this.x) {}", "}"]));
     resolve(source);
     assertErrors(source, [
         ParserErrorCode.FIELD_INITIALIZER_OUTSIDE_CONSTRUCTOR,
         CompileTimeErrorCode.FIELD_INITIALIZER_OUTSIDE_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_fieldInitializerOutsideConstructor_defaultParameter() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x;", "  m([this.x]) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.FIELD_INITIALIZER_OUTSIDE_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_fieldInitializerRedirectingConstructor_afterRedirection() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int x;",
         "  A.named() {}",
         "  A() : this.named(), x = 42;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.FIELD_INITIALIZER_REDIRECTING_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_fieldInitializerRedirectingConstructor_beforeRedirection() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int x;",
         "  A.named() {}",
         "  A() : x = 42, this.named();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.FIELD_INITIALIZER_REDIRECTING_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_fieldInitializingFormalRedirectingConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int x;",
         "  A.named() {}",
         "  A(this.x) : this.named();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.FIELD_INITIALIZER_REDIRECTING_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_finalInitializedMultipleTimes_initializers() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final x;", "  A() : x = 0, x = 0 {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.FIELD_INITIALIZED_BY_MULTIPLE_INITIALIZERS]);
     verify([source]);
   }
 
   /**
    * This test doesn't test the FINAL_INITIALIZED_MULTIPLE_TIMES code, but tests the
    * FIELD_INITIALIZED_IN_PARAMETER_AND_INITIALIZER code instead. It is provided here to show
    * coverage over all of the permutations of initializers in constructor declarations.
    *
    * Note: FIELD_INITIALIZED_IN_PARAMETER_AND_INITIALIZER covers a subset of
    * FINAL_INITIALIZED_MULTIPLE_TIMES, since it more specific, we use it instead of the broader code
    */
   void test_finalInitializedMultipleTimes_initializingFormal_initializer() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final x;", "  A(this.x) : x = 0 {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.FIELD_INITIALIZED_IN_PARAMETER_AND_INITIALIZER]);
     verify([source]);
   }
+
   void test_finalInitializedMultipleTimes_initializingFormals() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final x;", "  A(this.x, this.x) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.FINAL_INITIALIZED_MULTIPLE_TIMES]);
     verify([source]);
   }
+
   void test_finalNotInitialized_instanceField_const_static() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  static const F;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_NOT_INITIALIZED]);
     verify([source]);
   }
+
   void test_finalNotInitialized_library_const() {
     Source source = addSource(EngineTestCase.createSource(["const F;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_NOT_INITIALIZED]);
     verify([source]);
   }
+
   void test_finalNotInitialized_local_const() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  const int x;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_NOT_INITIALIZED]);
     verify([source]);
   }
+
   void test_getterAndMethodWithSameName() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  x(y) {}", "  get x => 0;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.GETTER_AND_METHOD_WITH_SAME_NAME]);
     verify([source]);
   }
+
   void test_implementsDisallowedClass_bool() {
     Source source = addSource(EngineTestCase.createSource(["class A implements bool {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLEMENTS_DISALLOWED_CLASS]);
     verify([source]);
   }
+
   void test_implementsDisallowedClass_double() {
     Source source = addSource(EngineTestCase.createSource(["class A implements double {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLEMENTS_DISALLOWED_CLASS]);
     verify([source]);
   }
+
   void test_implementsDisallowedClass_int() {
     Source source = addSource(EngineTestCase.createSource(["class A implements int {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLEMENTS_DISALLOWED_CLASS]);
     verify([source]);
   }
+
   void test_implementsDisallowedClass_Null() {
     Source source = addSource(EngineTestCase.createSource(["class A implements Null {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLEMENTS_DISALLOWED_CLASS]);
     verify([source]);
   }
+
   void test_implementsDisallowedClass_num() {
     Source source = addSource(EngineTestCase.createSource(["class A implements num {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLEMENTS_DISALLOWED_CLASS]);
     verify([source]);
   }
+
   void test_implementsDisallowedClass_String() {
     Source source = addSource(EngineTestCase.createSource(["class A implements String {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLEMENTS_DISALLOWED_CLASS]);
     verify([source]);
   }
+
   void test_implementsDynamic() {
     Source source = addSource(EngineTestCase.createSource(["class A implements dynamic {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLEMENTS_DYNAMIC]);
     verify([source]);
   }
+
   void test_implementsNonClass_class() {
     Source source = addSource(EngineTestCase.createSource(["int A;", "class B implements A {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLEMENTS_NON_CLASS]);
     verify([source]);
   }
+
   void test_implementsNonClass_typeAlias() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "int B;", "class C = A implements B;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLEMENTS_NON_CLASS]);
     verify([source]);
   }
+
   void test_implementsRepeated() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "class B implements A, A {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLEMENTS_REPEATED]);
     verify([source]);
   }
+
   void test_implementsRepeated_3times() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {} class C{}",
         "class B implements A, A, A, A {}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.IMPLEMENTS_REPEATED,
         CompileTimeErrorCode.IMPLEMENTS_REPEATED,
         CompileTimeErrorCode.IMPLEMENTS_REPEATED]);
     verify([source]);
   }
+
   void test_implementsSuperClass() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "class B extends A implements A {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLEMENTS_SUPER_CLASS]);
     verify([source]);
   }
+
   void test_implementsSuperClass_Object() {
     Source source = addSource(EngineTestCase.createSource(["class A implements Object {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLEMENTS_SUPER_CLASS]);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_field() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var v;",
         "  A() : v = f;",
         "  var f;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLICIT_THIS_REFERENCE_IN_INITIALIZER]);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_field2() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final x = 0;", "  final y = x;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLICIT_THIS_REFERENCE_IN_INITIALIZER]);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_invocation() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var v;",
         "  A() : v = f();",
         "  f() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLICIT_THIS_REFERENCE_IN_INITIALIZER]);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_invocationInStatic() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  static var F = m();", "  m() {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLICIT_THIS_REFERENCE_IN_INITIALIZER]);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_redirectingConstructorInvocation() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A(p) {}",
         "  A.named() : this(f);",
         "  var f;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLICIT_THIS_REFERENCE_IN_INITIALIZER]);
     verify([source]);
   }
+
   void test_implicitThisReferenceInInitializer_superConstructorInvocation() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A(p) {}",
         "}",
         "class B extends A {",
         "  B() : super(f);",
         "  var f;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPLICIT_THIS_REFERENCE_IN_INITIALIZER]);
     verify([source]);
   }
+
   void test_importInternalLibrary() {
     Source source = addSource(EngineTestCase.createSource(["import 'dart:_interceptors';"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.IMPORT_INTERNAL_LIBRARY,
         HintCode.UNUSED_IMPORT]);
     verify([source]);
   }
+
   void test_importInternalLibrary_collection() {
     Source source = addSource(EngineTestCase.createSource(["import 'dart:_collection-dev';"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.IMPORT_INTERNAL_LIBRARY,
         HintCode.UNUSED_IMPORT]);
     verify([source]);
   }
+
   void test_importOfNonLibrary() {
     Source source = addSource(EngineTestCase.createSource(["library lib;", "import 'part.dart';", "A a;"]));
     addSource2("/part.dart", EngineTestCase.createSource(["part of lib;", "class A{}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.IMPORT_OF_NON_LIBRARY]);
     verify([source]);
   }
+
   void test_inconsistentCaseExpressionTypes() {
     Source source = addSource(EngineTestCase.createSource([
         "f(var p) {",
         "  switch (p) {",
         "    case 1:",
         "      break;",
         "    case 'a':",
         "      break;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INCONSISTENT_CASE_EXPRESSION_TYPES]);
     verify([source]);
   }
+
   void test_inconsistentCaseExpressionTypes_repeated() {
     Source source = addSource(EngineTestCase.createSource([
         "f(var p) {",
         "  switch (p) {",
         "    case 1:",
         "      break;",
         "    case 'a':",
         "      break;",
         "    case 'b':",
         "      break;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.INCONSISTENT_CASE_EXPRESSION_TYPES,
         CompileTimeErrorCode.INCONSISTENT_CASE_EXPRESSION_TYPES]);
     verify([source]);
   }
+
   void test_initializerForNonExistant_initializer() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A() : x = 0 {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INITIALIZER_FOR_NON_EXISTANT_FIELD]);
   }
+
   void test_initializerForStaticField() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  static int x;", "  A() : x = 0 {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INITIALIZER_FOR_STATIC_FIELD]);
     verify([source]);
   }
+
   void test_initializingFormalForNonExistantField() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A(this.x) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INITIALIZING_FORMAL_FOR_NON_EXISTANT_FIELD]);
     verify([source]);
   }
+
   void test_initializingFormalForNonExistantField_notInEnclosingClass() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "int x;",
         "}",
         "class B extends A {",
         "  B(this.x) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INITIALIZING_FORMAL_FOR_NON_EXISTANT_FIELD]);
     verify([source]);
   }
+
   void test_initializingFormalForNonExistantField_optional() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A([this.x]) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INITIALIZING_FORMAL_FOR_NON_EXISTANT_FIELD]);
     verify([source]);
   }
+
   void test_initializingFormalForNonExistantField_synthetic() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int get x => 1;", "  A(this.x) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INITIALIZING_FORMAL_FOR_NON_EXISTANT_FIELD]);
     verify([source]);
   }
+
   void test_initializingFormalForStaticField() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  static int x;", "  A([this.x]) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INITIALIZING_FORMAL_FOR_STATIC_FIELD]);
     verify([source]);
   }
+
   void test_instanceMemberAccessFromStatic_field() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int f;",
         "  static foo() {",
         "    f;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INSTANCE_MEMBER_ACCESS_FROM_STATIC]);
     verify([source]);
   }
+
   void test_instanceMemberAccessFromStatic_getter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  get g => null;",
         "  static foo() {",
         "    g;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INSTANCE_MEMBER_ACCESS_FROM_STATIC]);
     verify([source]);
   }
+
   void test_instanceMemberAccessFromStatic_method() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m() {}",
         "  static foo() {",
         "    m();",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INSTANCE_MEMBER_ACCESS_FROM_STATIC]);
     verify([source]);
   }
+
   void test_invalidAnnotation_getter() {
     Source source = addSource(EngineTestCase.createSource(["get V => 0;", "@V", "main() {", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_ANNOTATION]);
     verify([source]);
   }
+
   void test_invalidAnnotation_importWithPrefix_getter() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "get V => 0;"]));
     Source source = addSource(EngineTestCase.createSource(["import 'lib.dart' as p;", "@p.V", "main() {", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_ANNOTATION]);
     verify([source]);
   }
+
   void test_invalidAnnotation_importWithPrefix_notConstantVariable() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "final V = 0;"]));
     Source source = addSource(EngineTestCase.createSource(["import 'lib.dart' as p;", "@p.V", "main() {", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_ANNOTATION]);
     verify([source]);
   }
+
   void test_invalidAnnotation_importWithPrefix_notVariableOrConstructorInvocation() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "typedef V();"]));
     Source source = addSource(EngineTestCase.createSource(["import 'lib.dart' as p;", "@p.V", "main() {", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_ANNOTATION]);
     verify([source]);
   }
+
   void test_invalidAnnotation_notConstantVariable() {
     Source source = addSource(EngineTestCase.createSource(["final V = 0;", "@V", "main() {", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_ANNOTATION]);
     verify([source]);
   }
+
   void test_invalidAnnotation_notVariableOrConstructorInvocation() {
     Source source = addSource(EngineTestCase.createSource(["typedef V();", "@V", "main() {", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_ANNOTATION]);
     verify([source]);
   }
+
   void test_invalidAnnotation_staticMethodReference() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static f() {}",
         "}",
         "@A.f",
         "main() {",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_ANNOTATION]);
     verify([source]);
   }
+
   void test_invalidAnnotation_unresolved_identifier() {
     Source source = addSource(EngineTestCase.createSource(["@unresolved", "main() {", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_ANNOTATION]);
   }
+
   void test_invalidAnnotation_unresolved_invocation() {
     Source source = addSource(EngineTestCase.createSource(["@Unresolved()", "main() {", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_ANNOTATION]);
   }
+
   void test_invalidAnnotation_unresolved_prefixedIdentifier() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'dart:math' as p;",
         "@p.unresolved",
         "main() {",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_ANNOTATION]);
   }
+
   void test_invalidConstructorName_notEnclosingClassName_defined() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  B() : super();", "}", "class B {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_CONSTRUCTOR_NAME]);
   }
+
   void test_invalidConstructorName_notEnclosingClassName_undefined() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  B() : super();", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_CONSTRUCTOR_NAME]);
   }
+
   void test_invalidFactoryNameNotAClass_notClassName() {
     Source source = addSource(EngineTestCase.createSource(["int B;", "class A {", "  factory B() {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_FACTORY_NAME_NOT_A_CLASS]);
     verify([source]);
   }
+
   void test_invalidFactoryNameNotAClass_notEnclosingClassName() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  factory B() {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_FACTORY_NAME_NOT_A_CLASS]);
   }
+
   void test_invalidReferenceToThis_factoryConstructor() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  factory A() { return this; }", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_REFERENCE_TO_THIS]);
     verify([source]);
   }
+
   void test_invalidReferenceToThis_instanceVariableInitializer_inConstructor() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  var f;", "  A() : f = this;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_REFERENCE_TO_THIS]);
     verify([source]);
   }
+
   void test_invalidReferenceToThis_instanceVariableInitializer_inDeclaration() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  var f = this;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_REFERENCE_TO_THIS]);
     verify([source]);
   }
+
   void test_invalidReferenceToThis_staticMethod() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  static m() { return this; }", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_REFERENCE_TO_THIS]);
     verify([source]);
   }
+
   void test_invalidReferenceToThis_staticVariableInitializer() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  static A f = this;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_REFERENCE_TO_THIS]);
     verify([source]);
   }
+
   void test_invalidReferenceToThis_superInitializer() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A(var x) {}",
         "}",
         "class B extends A {",
         "  B() : super(this);",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_REFERENCE_TO_THIS]);
     verify([source]);
   }
+
   void test_invalidReferenceToThis_topLevelFunction() {
     Source source = addSource("f() { return this; }");
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_REFERENCE_TO_THIS]);
     verify([source]);
   }
+
   void test_invalidReferenceToThis_variableInitializer() {
     Source source = addSource("int x = this;");
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_REFERENCE_TO_THIS]);
     verify([source]);
   }
+
   void test_invalidTypeArgumentInConstList() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<E> {",
         "  m() {",
         "    return const <E>[];",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_TYPE_ARGUMENT_IN_CONST_LIST]);
     verify([source]);
   }
+
   void test_invalidTypeArgumentInConstMap() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<E> {",
         "  m() {",
         "    return const <String, E>{};",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_TYPE_ARGUMENT_IN_CONST_MAP]);
     verify([source]);
   }
+
   void test_invalidUri_export() {
     Source source = addSource(EngineTestCase.createSource(["export 'ht:';"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_URI]);
   }
+
   void test_invalidUri_import() {
     Source source = addSource(EngineTestCase.createSource(["import 'ht:';"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_URI]);
   }
+
   void test_invalidUri_part() {
     Source source = addSource(EngineTestCase.createSource(["part 'ht:';"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.INVALID_URI]);
   }
+
   void test_labelInOuterScope() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void m(int i) {",
         "    l: while (i > 0) {",
         "      void f() {",
         "        break l;",
         "      };",
         "    }",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.LABEL_IN_OUTER_SCOPE]);
   }
+
   void test_labelUndefined_break() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {",
         "  x: while (true) {",
         "    break y;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.LABEL_UNDEFINED]);
   }
+
   void test_labelUndefined_continue() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {",
         "  x: while (true) {",
         "    continue y;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.LABEL_UNDEFINED]);
   }
+
   void test_listElementTypeNotAssignable() {
     Source source = addSource(EngineTestCase.createSource(["var v = const <String> [42];"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.LIST_ELEMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_mapKeyTypeNotAssignable() {
     Source source = addSource(EngineTestCase.createSource(["var v = const <String, int > {1 : 2};"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MAP_KEY_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_mapValueTypeNotAssignable() {
     Source source = addSource(EngineTestCase.createSource(["var v = const <String, String> {'a' : 2};"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MAP_VALUE_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_memberWithClassName_field() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int A = 0;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME]);
     verify([source]);
   }
+
   void test_memberWithClassName_field2() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int z, A, b = 0;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME]);
     verify([source]);
   }
+
   void test_memberWithClassName_getter() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  get A => 0;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME]);
     verify([source]);
   }
+
   void test_memberWithClassName_method() {
   }
+
   void test_methodAndGetterWithSameName() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  get x => 0;", "  x(y) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.METHOD_AND_GETTER_WITH_SAME_NAME]);
     verify([source]);
   }
+
   void test_mixinDeclaresConstructor_classDeclaration() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A() {}",
         "}",
         "class B extends Object with A {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_DECLARES_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_mixinDeclaresConstructor_typeAlias() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A() {}", "}", "class B = Object with A;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_DECLARES_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_mixinInheritsFromNotObject_classDeclaration_extends() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {}",
         "class C extends Object with B {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_INHERITS_FROM_NOT_OBJECT]);
     verify([source]);
   }
+
   void test_mixinInheritsFromNotObject_classDeclaration_with() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends Object with A {}",
         "class C extends Object with B {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_INHERITS_FROM_NOT_OBJECT]);
     verify([source]);
   }
+
   void test_mixinInheritsFromNotObject_typeAlias_extends() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {}",
         "class C = Object with B;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_INHERITS_FROM_NOT_OBJECT]);
     verify([source]);
   }
+
   void test_mixinInheritsFromNotObject_typeAlias_with() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends Object with A {}",
         "class C = Object with B;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_INHERITS_FROM_NOT_OBJECT]);
     verify([source]);
   }
+
   void test_mixinOfDisallowedClass_bool() {
     Source source = addSource(EngineTestCase.createSource(["class A extends Object with bool {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_OF_DISALLOWED_CLASS]);
     verify([source]);
   }
+
   void test_mixinOfDisallowedClass_double() {
     Source source = addSource(EngineTestCase.createSource(["class A extends Object with double {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_OF_DISALLOWED_CLASS]);
     verify([source]);
   }
+
   void test_mixinOfDisallowedClass_int() {
     Source source = addSource(EngineTestCase.createSource(["class A extends Object with int {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_OF_DISALLOWED_CLASS]);
     verify([source]);
   }
+
   void test_mixinOfDisallowedClass_Null() {
     Source source = addSource(EngineTestCase.createSource(["class A extends Object with Null {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_OF_DISALLOWED_CLASS]);
     verify([source]);
   }
+
   void test_mixinOfDisallowedClass_num() {
     Source source = addSource(EngineTestCase.createSource(["class A extends Object with num {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_OF_DISALLOWED_CLASS]);
     verify([source]);
   }
+
   void test_mixinOfDisallowedClass_String() {
     Source source = addSource(EngineTestCase.createSource(["class A extends Object with String {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_OF_DISALLOWED_CLASS]);
     verify([source]);
   }
+
   void test_mixinOfNonClass_class() {
     Source source = addSource(EngineTestCase.createSource(["int A;", "class B extends Object with A {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_OF_NON_CLASS]);
     verify([source]);
   }
+
   void test_mixinOfNonClass_typeAlias() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "int B;", "class C = A with B;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_OF_NON_CLASS]);
     verify([source]);
   }
+
   void test_mixinReferencesSuper() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  toString() => super.toString();",
         "}",
         "class B extends Object with A {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_REFERENCES_SUPER]);
     verify([source]);
   }
+
   void test_mixinWithNonClassSuperclass_class() {
     Source source = addSource(EngineTestCase.createSource(["int A;", "class B {}", "class C extends A with B {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_WITH_NON_CLASS_SUPERCLASS]);
     verify([source]);
   }
+
   void test_mixinWithNonClassSuperclass_typeAlias() {
     Source source = addSource(EngineTestCase.createSource(["int A;", "class B {}", "class C = A with B;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MIXIN_WITH_NON_CLASS_SUPERCLASS]);
     verify([source]);
   }
+
   void test_multipleRedirectingConstructorInvocations() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A() : this.a(), this.b();",
         "  A.a() {}",
         "  A.b() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MULTIPLE_REDIRECTING_CONSTRUCTOR_INVOCATIONS]);
     verify([source]);
   }
+
   void test_multipleSuperInitializers() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  B() : super(), super() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.MULTIPLE_SUPER_INITIALIZERS]);
     verify([source]);
   }
+
   void test_nativeClauseInNonSDKCode() {
     Source source = addSource(EngineTestCase.createSource(["class A native 'string' {}"]));
     resolve(source);
     assertErrors(source, [ParserErrorCode.NATIVE_CLAUSE_IN_NON_SDK_CODE]);
     verify([source]);
   }
+
   void test_nativeFunctionBodyInNonSDKCode_function() {
     Source source = addSource(EngineTestCase.createSource(["int m(a) native 'string';"]));
     resolve(source);
     assertErrors(source, [ParserErrorCode.NATIVE_FUNCTION_BODY_IN_NON_SDK_CODE]);
     verify([source]);
   }
+
   void test_nativeFunctionBodyInNonSDKCode_method() {
     Source source = addSource(EngineTestCase.createSource(["class A{", "  static int m(a) native 'string';", "}"]));
     resolve(source);
     assertErrors(source, [ParserErrorCode.NATIVE_FUNCTION_BODY_IN_NON_SDK_CODE]);
     verify([source]);
   }
+
   void test_noAnnotationConstructorArguments() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  const A();", "}", "@A", "main() {", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NO_ANNOTATION_CONSTRUCTOR_ARGUMENTS]);
     verify([source]);
   }
+
   void test_noDefaultSuperConstructorExplicit() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A(p);",
         "}",
         "class B extends A {",
         "  B() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_EXPLICIT]);
     verify([source]);
   }
+
   void test_noDefaultSuperConstructorImplicit_superHasParameters() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A(p);", "}", "class B extends A {", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_IMPLICIT]);
     verify([source]);
   }
+
   void test_noDefaultSuperConstructorImplicit_superOnlyNamed() {
     Source source = addSource(EngineTestCase.createSource(["class A { A.named() {} }", "class B extends A {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_IMPLICIT]);
     verify([source]);
   }
+
   void test_nonConstantAnnotationConstructor_named() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A.fromInt() {}",
         "}",
         "@A.fromInt()",
         "main() {",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_ANNOTATION_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_nonConstantAnnotationConstructor_unnamed() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A() {}", "}", "@A()", "main() {", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_ANNOTATION_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_nonConstantDefaultValue_function_named() {
     Source source = addSource(EngineTestCase.createSource(["int y;", "f({x : y}) {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_DEFAULT_VALUE]);
     verify([source]);
   }
+
   void test_nonConstantDefaultValue_function_positional() {
     Source source = addSource(EngineTestCase.createSource(["int y;", "f([x = y]) {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_DEFAULT_VALUE]);
     verify([source]);
   }
+
   void test_nonConstantDefaultValue_inConstructor_named() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int y;", "  A({x : y}) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_DEFAULT_VALUE]);
     verify([source]);
   }
+
   void test_nonConstantDefaultValue_inConstructor_positional() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int y;", "  A([x = y]) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_DEFAULT_VALUE]);
     verify([source]);
   }
+
   void test_nonConstantDefaultValue_method_named() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int y;", "  m({x : y}) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_DEFAULT_VALUE]);
     verify([source]);
   }
+
   void test_nonConstantDefaultValue_method_positional() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int y;", "  m([x = y]) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_DEFAULT_VALUE]);
     verify([source]);
   }
+
   void test_nonConstCaseExpression() {
     Source source = addSource(EngineTestCase.createSource([
         "f(int p, int q) {",
         "  switch (p) {",
         "    case 3 + q:",
         "      break;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_CASE_EXPRESSION]);
     verify([source]);
   }
+
   void test_nonConstListElement() {
     Source source = addSource(EngineTestCase.createSource(["f(a) {", "  return const [a];", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_LIST_ELEMENT]);
     verify([source]);
   }
+
   void test_nonConstMapAsExpressionStatement_begin() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  {'a' : 0, 'b' : 1}.length;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONST_MAP_AS_EXPRESSION_STATEMENT]);
     verify([source]);
   }
+
   void test_nonConstMapAsExpressionStatement_only() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  {'a' : 0, 'b' : 1};", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONST_MAP_AS_EXPRESSION_STATEMENT]);
     verify([source]);
   }
+
   void test_nonConstMapKey() {
     Source source = addSource(EngineTestCase.createSource(["f(a) {", "  return const {a : 0};", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_MAP_KEY]);
     verify([source]);
   }
+
   void test_nonConstMapValue() {
     Source source = addSource(EngineTestCase.createSource(["f(a) {", "  return const {'a' : a};", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_MAP_VALUE]);
     verify([source]);
   }
+
   void test_nonConstValueInInitializer_binary_notBool_left() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final bool a;",
         "  const A(String p) : a = p && true;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_EVAL_TYPE_BOOL]);
     verify([source]);
   }
+
   void test_nonConstValueInInitializer_binary_notBool_right() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final bool a;",
         "  const A(String p) : a = true && p;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_EVAL_TYPE_BOOL]);
     verify([source]);
   }
+
   void test_nonConstValueInInitializer_binary_notInt() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final int a;",
         "  const A(String p) : a = 5 & p;",
         "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.CONST_EVAL_TYPE_INT,
         StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_nonConstValueInInitializer_binary_notNum() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final int a;",
         "  const A(String p) : a = 5 + p;",
         "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.CONST_EVAL_TYPE_NUM,
         StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_nonConstValueInInitializer_field() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static int C;",
         "  final int a;",
         "  const A() : a = C;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_VALUE_IN_INITIALIZER]);
     verify([source]);
   }
+
   void test_nonConstValueInInitializer_redirecting() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static var C;",
         "  const A.named(p);",
         "  const A() : this.named(C);",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_VALUE_IN_INITIALIZER]);
     verify([source]);
   }
+
   void test_nonConstValueInInitializer_super() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A(p);",
         "}",
         "class B extends A {",
         "  static var C;",
         "  const B() : super(C);",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_CONSTANT_VALUE_IN_INITIALIZER]);
     verify([source]);
   }
+
   void test_nonGenerativeConstructor_explicit() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  factory A.named() {}",
         "}",
         "class B extends A {",
         "  B() : super.named();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_GENERATIVE_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_nonGenerativeConstructor_implicit() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  factory A() {}",
         "}",
         "class B extends A {",
         "  B();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_GENERATIVE_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_nonGenerativeConstructor_implicit2() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  factory A() {}",
         "}",
         "class B extends A {",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NON_GENERATIVE_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_notEnoughRequiredArguments_const() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A(int p);",
         "}",
         "main() {",
         "  const A();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NOT_ENOUGH_REQUIRED_ARGUMENTS]);
     verify([source]);
   }
+
   void test_notEnoughRequiredArguments_const_super() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A(int p);",
         "}",
         "class B extends A {",
         "  const B() : super();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.NOT_ENOUGH_REQUIRED_ARGUMENTS]);
     verify([source]);
   }
+
   void test_optionalParameterInOperator_named() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  operator +({p}) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.OPTIONAL_PARAMETER_IN_OPERATOR]);
     verify([source]);
   }
+
   void test_optionalParameterInOperator_positional() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  operator +([p]) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.OPTIONAL_PARAMETER_IN_OPERATOR]);
     verify([source]);
   }
+
   void test_partOfNonPart() {
     Source source = addSource(EngineTestCase.createSource(["library l1;", "part 'l2.dart';"]));
     addSource2("/l2.dart", EngineTestCase.createSource(["library l2;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.PART_OF_NON_PART]);
     verify([source]);
   }
+
   void test_prefixCollidesWithTopLevelMembers_functionTypeAlias() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class A{}"]));
     Source source = addSource(EngineTestCase.createSource(["import 'lib.dart' as p;", "typedef p();", "p.A a;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.PREFIX_COLLIDES_WITH_TOP_LEVEL_MEMBER]);
     verify([source]);
   }
+
   void test_prefixCollidesWithTopLevelMembers_topLevelFunction() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class A{}"]));
     Source source = addSource(EngineTestCase.createSource(["import 'lib.dart' as p;", "p() {}", "p.A a;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.PREFIX_COLLIDES_WITH_TOP_LEVEL_MEMBER]);
     verify([source]);
   }
+
   void test_prefixCollidesWithTopLevelMembers_topLevelVariable() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class A{}"]));
     Source source = addSource(EngineTestCase.createSource(["import 'lib.dart' as p;", "var p = null;", "p.A a;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.PREFIX_COLLIDES_WITH_TOP_LEVEL_MEMBER]);
     verify([source]);
   }
+
   void test_prefixCollidesWithTopLevelMembers_type() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class A{}"]));
     Source source = addSource(EngineTestCase.createSource(["import 'lib.dart' as p;", "class p {}", "p.A a;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.PREFIX_COLLIDES_WITH_TOP_LEVEL_MEMBER]);
     verify([source]);
   }
+
   void test_privateOptionalParameter() {
     Source source = addSource(EngineTestCase.createSource(["f({var _p}) {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.PRIVATE_OPTIONAL_PARAMETER]);
     verify([source]);
   }
+
   void test_privateOptionalParameter_fieldFormal() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  var _p;", "  A({this._p: 0});", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.PRIVATE_OPTIONAL_PARAMETER]);
     verify([source]);
   }
+
   void test_privateOptionalParameter_withDefaultValue() {
     Source source = addSource(EngineTestCase.createSource(["f({_p : 0}) {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.PRIVATE_OPTIONAL_PARAMETER]);
     verify([source]);
   }
+
   void test_recursiveConstructorRedirect() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A.a() : this.b();",
         "  A.b() : this.a();",
         "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.RECURSIVE_CONSTRUCTOR_REDIRECT,
         CompileTimeErrorCode.RECURSIVE_CONSTRUCTOR_REDIRECT]);
     verify([source]);
   }
+
   void test_recursiveConstructorRedirect_directSelfReference() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A() : this();", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.RECURSIVE_CONSTRUCTOR_REDIRECT]);
     verify([source]);
   }
+
   void test_recursiveFactoryRedirect() {
     Source source = addSource(EngineTestCase.createSource([
         "class A implements B {",
         "  factory A() = C;",
         "}",
         "class B implements C {",
         "  factory B() = A;",
         "}",
         "class C implements A {",
         "  factory C() = B;",
         "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.RECURSIVE_FACTORY_REDIRECT,
         CompileTimeErrorCode.RECURSIVE_FACTORY_REDIRECT,
         CompileTimeErrorCode.RECURSIVE_FACTORY_REDIRECT,
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE,
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE,
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE]);
     verify([source]);
   }
+
   void test_recursiveFactoryRedirect_directSelfReference() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  factory A() = A;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.RECURSIVE_FACTORY_REDIRECT]);
     verify([source]);
   }
+
   void test_recursiveFactoryRedirect_generic() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<T> implements B<T> {",
         "  factory A() = C;",
         "}",
         "class B<T> implements C<T> {",
         "  factory B() = A;",
         "}",
         "class C<T> implements A<T> {",
         "  factory C() = B;",
         "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.RECURSIVE_FACTORY_REDIRECT,
         CompileTimeErrorCode.RECURSIVE_FACTORY_REDIRECT,
         CompileTimeErrorCode.RECURSIVE_FACTORY_REDIRECT,
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE,
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE,
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE]);
     verify([source]);
   }
+
   void test_recursiveFactoryRedirect_named() {
     Source source = addSource(EngineTestCase.createSource([
         "class A implements B {",
         "  factory A.nameA() = C.nameC;",
         "}",
         "class B implements C {",
         "  factory B.nameB() = A.nameA;",
         "}",
         "class C implements A {",
         "  factory C.nameC() = B.nameB;",
@@ skipping 25 matching lines @@
         "  factory C() = B;",
         "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.RECURSIVE_FACTORY_REDIRECT,
         CompileTimeErrorCode.RECURSIVE_FACTORY_REDIRECT,
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE,
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE]);
     verify([source]);
   }
+
   void test_recursiveInterfaceInheritance_extends() {
     Source source = addSource(EngineTestCase.createSource(["class A extends B {}", "class B extends A {}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE,
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE]);
     verify([source]);
   }
+
   void test_recursiveInterfaceInheritance_extends_implements() {
     Source source = addSource(EngineTestCase.createSource(["class A extends B {}", "class B implements A {}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE,
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE]);
     verify([source]);
   }
+
   void test_recursiveInterfaceInheritance_implements() {
     Source source = addSource(EngineTestCase.createSource(["class A implements B {}", "class B implements A {}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE,
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE]);
     verify([source]);
   }
+
   void test_recursiveInterfaceInheritance_tail() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A implements A {}",
         "class B implements A {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE_BASE_CASE_IMPLEMENTS]);
     verify([source]);
   }
+
   void test_recursiveInterfaceInheritance_tail2() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A implements B {}",
         "abstract class B implements A {}",
         "class C implements A {}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE,
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE]);
     verify([source]);
   }
+
   void test_recursiveInterfaceInheritance_tail3() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A implements B {}",
         "abstract class B implements C {}",
         "abstract class C implements A {}",
         "class D implements A {}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE,
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE,
         CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE]);
     verify([source]);
   }
+
   void test_recursiveInterfaceInheritanceBaseCaseExtends() {
     Source source = addSource(EngineTestCase.createSource(["class A extends A {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE_BASE_CASE_EXTENDS]);
     verify([source]);
   }
+
   void test_recursiveInterfaceInheritanceBaseCaseImplements() {
     Source source = addSource(EngineTestCase.createSource(["class A implements A {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE_BASE_CASE_IMPLEMENTS]);
     verify([source]);
   }
+
   void test_recursiveInterfaceInheritanceBaseCaseImplements_typeAlias() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class M {}",
         "class B = A with M implements B;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE_BASE_CASE_IMPLEMENTS]);
     verify([source]);
   }
+
   void test_redirectToMissingConstructor_named() {
     Source source = addSource(EngineTestCase.createSource([
         "class A implements B{",
         "  A() {}",
         "}",
         "class B {",
         "  const factory B() = A.name;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.REDIRECT_TO_MISSING_CONSTRUCTOR]);
   }
+
   void test_redirectToMissingConstructor_unnamed() {
     Source source = addSource(EngineTestCase.createSource([
         "class A implements B{",
         "  A.name() {}",
         "}",
         "class B {",
         "  const factory B() = A;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.REDIRECT_TO_MISSING_CONSTRUCTOR]);
   }
+
   void test_redirectToNonClass_notAType() {
     Source source = addSource(EngineTestCase.createSource(["int A;", "class B {", "  const factory B() = A;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.REDIRECT_TO_NON_CLASS]);
     verify([source]);
   }
+
   void test_redirectToNonClass_undefinedIdentifier() {
     Source source = addSource(EngineTestCase.createSource(["class B {", "  const factory B() = A;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.REDIRECT_TO_NON_CLASS]);
     verify([source]);
   }
+
   void test_redirectToNonConstConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A.a() {}",
         "  const factory A.b() = A.a;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.REDIRECT_TO_NON_CONST_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_referencedBeforeDeclaration_hideInBlock_function() {
     Source source = addSource(EngineTestCase.createSource([
         "var v = 1;",
         "main() {",
         "  print(v);",
         "  v() {}",
         "}",
         "print(x) {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.REFERENCED_BEFORE_DECLARATION]);
   }
+
   void test_referencedBeforeDeclaration_hideInBlock_local() {
     Source source = addSource(EngineTestCase.createSource([
         "var v = 1;",
         "main() {",
         "  print(v);",
         "  var v = 2;",
         "}",
         "print(x) {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.REFERENCED_BEFORE_DECLARATION]);
   }
+
   void test_referencedBeforeDeclaration_hideInBlock_subBlock() {
     Source source = addSource(EngineTestCase.createSource([
         "var v = 1;",
         "main() {",
         "  {",
         "    print(v);",
         "  }",
         "  var v = 2;",
         "}",
         "print(x) {}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.REFERENCED_BEFORE_DECLARATION]);
   }
+
+  void test_referencedBeforeDeclaration_inInitializer_closure() {
+    Source source = addSource(EngineTestCase.createSource(["main() {", "  var v = () => v;", "}"]));
+    resolve(source);
+    assertErrors(source, [CompileTimeErrorCode.REFERENCED_BEFORE_DECLARATION]);
+  }
+
+  void test_referencedBeforeDeclaration_inInitializer_directly() {
+    Source source = addSource(EngineTestCase.createSource(["main() {", "  var v = v;", "}"]));
+    resolve(source);
+    assertErrors(source, [CompileTimeErrorCode.REFERENCED_BEFORE_DECLARATION]);
+  }
+
   void test_rethrowOutsideCatch() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  rethrow;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.RETHROW_OUTSIDE_CATCH]);
     verify([source]);
   }
+
   void test_returnInGenerativeConstructor() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A() { return 0; }", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.RETURN_IN_GENERATIVE_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_returnInGenerativeConstructor_expressionFunctionBody() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A() => null;", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.RETURN_IN_GENERATIVE_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_superInInvalidContext_binaryExpression() {
     Source source = addSource(EngineTestCase.createSource(["var v = super + 0;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.SUPER_IN_INVALID_CONTEXT]);
   }
+
   void test_superInInvalidContext_constructorFieldInitializer() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m() {}",
         "}",
         "class B extends A {",
         "  var f;",
         "  B() : f = super.m();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.SUPER_IN_INVALID_CONTEXT]);
   }
+
   void test_superInInvalidContext_factoryConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m() {}",
         "}",
         "class B extends A {",
         "  factory B() {",
         "    super.m();",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.SUPER_IN_INVALID_CONTEXT]);
   }
+
   void test_superInInvalidContext_instanceVariableInitializer() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  var a;",
         "}",
         "class B extends A {",
         " var b = super.a;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.SUPER_IN_INVALID_CONTEXT]);
   }
+
   void test_superInInvalidContext_staticMethod() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static m() {}",
         "}",
         "class B extends A {",
         "  static n() { return super.m(); }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.SUPER_IN_INVALID_CONTEXT]);
   }
+
   void test_superInInvalidContext_staticVariableInitializer() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static int a = 0;",
         "}",
         "class B extends A {",
         "  static int b = super.a;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.SUPER_IN_INVALID_CONTEXT]);
   }
+
   void test_superInInvalidContext_topLevelFunction() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  super.f();", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.SUPER_IN_INVALID_CONTEXT]);
   }
+
   void test_superInInvalidContext_topLevelVariableInitializer() {
     Source source = addSource(EngineTestCase.createSource(["var v = super.y;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.SUPER_IN_INVALID_CONTEXT]);
   }
+
   void test_superInRedirectingConstructor_redirectionSuper() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {",
         "  B() : this.name(), super();",
         "  B.name() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.SUPER_IN_REDIRECTING_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_superInRedirectingConstructor_superRedirection() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {",
         "  B() : super(), this.name();",
         "  B.name() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.SUPER_IN_REDIRECTING_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_typeAliasCannotReferenceItself_parameterType_named() {
     Source source = addSource(EngineTestCase.createSource(["typedef A({A a});"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.TYPE_ALIAS_CANNOT_REFERENCE_ITSELF]);
     verify([source]);
   }
+
   void test_typeAliasCannotReferenceItself_parameterType_positional() {
     Source source = addSource(EngineTestCase.createSource(["typedef A([A a]);"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.TYPE_ALIAS_CANNOT_REFERENCE_ITSELF]);
     verify([source]);
   }
+
   void test_typeAliasCannotReferenceItself_parameterType_required() {
     Source source = addSource(EngineTestCase.createSource(["typedef A(A a);"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.TYPE_ALIAS_CANNOT_REFERENCE_ITSELF]);
     verify([source]);
   }
+
   void test_typeAliasCannotReferenceItself_parameterType_typeArgument() {
     Source source = addSource(EngineTestCase.createSource(["typedef A(List<A> a);"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.TYPE_ALIAS_CANNOT_REFERENCE_ITSELF]);
     verify([source]);
   }
+
   void test_typeAliasCannotReferenceItself_returnClass_withTypeAlias() {
     Source source = addSource(EngineTestCase.createSource([
         "typedef C A();",
         "typedef A B();",
         "class C {",
         "  B a;",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.TYPE_ALIAS_CANNOT_REFERENCE_ITSELF]);
     verify([source]);
   }
+
   void test_typeAliasCannotReferenceItself_returnType() {
     Source source = addSource(EngineTestCase.createSource(["typedef A A();"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.TYPE_ALIAS_CANNOT_REFERENCE_ITSELF]);
     verify([source]);
   }
+
   void test_typeAliasCannotReferenceItself_returnType_indirect() {
     Source source = addSource(EngineTestCase.createSource(["typedef B A();", "typedef A B();"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.TYPE_ALIAS_CANNOT_REFERENCE_ITSELF,
         CompileTimeErrorCode.TYPE_ALIAS_CANNOT_REFERENCE_ITSELF]);
     verify([source]);
   }
+
   void test_typeAliasCannotReferenceItself_typeVariableBounds() {
     Source source = addSource(EngineTestCase.createSource(["typedef A<T extends A>();"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.TYPE_ALIAS_CANNOT_REFERENCE_ITSELF]);
     verify([source]);
   }
+
   void test_typeAliasCannotRereferenceItself_mixin_direct() {
     Source source = addSource(EngineTestCase.createSource(["class M = Object with M;"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.TYPE_ALIAS_CANNOT_REFERENCE_ITSELF]);
     verify([source]);
   }
+
   void test_typeAliasCannotRereferenceItself_mixin_indirect() {
     Source source = addSource(EngineTestCase.createSource([
         "class M1 = Object with M2;",
         "class M2 = Object with M1;"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.TYPE_ALIAS_CANNOT_REFERENCE_ITSELF,
         CompileTimeErrorCode.TYPE_ALIAS_CANNOT_REFERENCE_ITSELF]);
     verify([source]);
   }
+
   void test_typeArgumentNotMatchingBounds_const() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B {}",
         "class G<E extends A> {",
         "  const G();",
         "}",
         "f() { return const G<B>(); }"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS]);
     verify([source]);
   }
+
   void test_undefinedClass_const() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  return const A();", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.UNDEFINED_CLASS]);
     verify([source]);
   }
+
   void test_undefinedConstructorInInitializer_explicit_named() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  B() : super.named();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.UNDEFINED_CONSTRUCTOR_IN_INITIALIZER]);
   }
+
   void test_undefinedConstructorInInitializer_explicit_unnamed() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A.named() {}",
         "}",
         "class B extends A {",
         "  B() : super();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.UNDEFINED_CONSTRUCTOR_IN_INITIALIZER_DEFAULT]);
     verify([source]);
   }
+
   void test_undefinedConstructorInInitializer_implicit() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A.named() {}",
         "}",
         "class B extends A {",
         "  B();",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.UNDEFINED_CONSTRUCTOR_IN_INITIALIZER_DEFAULT]);
     verify([source]);
   }
+
   void test_undefinedFunction() {
     Source source = addSource(EngineTestCase.createSource(["void f() {", "  g();", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.UNDEFINED_FUNCTION]);
   }
+
   void test_undefinedFunction_hasImportPrefix() {
     Source source = addSource(EngineTestCase.createSource(["import 'lib.dart' as f;", "main() { return f(); }"]));
     addSource2("/lib.dart", "library lib;");
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.UNDEFINED_FUNCTION]);
   }
+
   void test_undefinedFunction_inCatch() {
     Source source = addSource(EngineTestCase.createSource([
         "void f() {",
         "  try {",
         "  } on Object {",
         "    g();",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.UNDEFINED_FUNCTION]);
   }
+
   void test_undefinedNamedParameter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A();",
         "}",
         "main() {",
         "  const A(p: 0);",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.UNDEFINED_NAMED_PARAMETER]);
   }
+
   void test_uriDoesNotExist_export() {
     Source source = addSource(EngineTestCase.createSource(["export 'unknown.dart';"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.URI_DOES_NOT_EXIST]);
   }
+
   void test_uriDoesNotExist_import() {
     Source source = addSource(EngineTestCase.createSource(["import 'unknown.dart';"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.URI_DOES_NOT_EXIST]);
   }
+
   void test_uriDoesNotExist_part() {
     Source source = addSource(EngineTestCase.createSource(["part 'unknown.dart';"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.URI_DOES_NOT_EXIST]);
   }
+
   void test_uriWithInterpolation_constant() {
     Source source = addSource(EngineTestCase.createSource(["import 'stuff_\$platform.dart';"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.URI_WITH_INTERPOLATION,
         StaticWarningCode.UNDEFINED_IDENTIFIER]);
   }
+
   void test_uriWithInterpolation_nonConstant() {
     Source source = addSource(EngineTestCase.createSource(["library lib;", "part '\${'a'}.dart';"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.URI_WITH_INTERPOLATION]);
   }
+
   void test_wrongNumberOfParametersForOperator_minus() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  operator -(a, b) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.WRONG_NUMBER_OF_PARAMETERS_FOR_OPERATOR_MINUS]);
     verify([source]);
     reset();
   }
+
   void test_wrongNumberOfParametersForOperator_tilde() {
     check_wrongNumberOfParametersForOperator("~", "a");
     check_wrongNumberOfParametersForOperator("~", "a, b");
   }
+
   void test_wrongNumberOfParametersForOperator1() {
     check_wrongNumberOfParametersForOperator1("<");
     check_wrongNumberOfParametersForOperator1(">");
     check_wrongNumberOfParametersForOperator1("<=");
     check_wrongNumberOfParametersForOperator1(">=");
     check_wrongNumberOfParametersForOperator1("+");
     check_wrongNumberOfParametersForOperator1("/");
     check_wrongNumberOfParametersForOperator1("~/");
     check_wrongNumberOfParametersForOperator1("*");
     check_wrongNumberOfParametersForOperator1("%");
     check_wrongNumberOfParametersForOperator1("|");
     check_wrongNumberOfParametersForOperator1("^");
     check_wrongNumberOfParametersForOperator1("&");
     check_wrongNumberOfParametersForOperator1("<<");
     check_wrongNumberOfParametersForOperator1(">>");
     check_wrongNumberOfParametersForOperator1("[]");
   }
+
   void test_wrongNumberOfParametersForSetter_function_named() {
     Source source = addSource("set x({p}) {}");
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.WRONG_NUMBER_OF_PARAMETERS_FOR_SETTER]);
     verify([source]);
   }
+
   void test_wrongNumberOfParametersForSetter_function_optional() {
     Source source = addSource("set x([p]) {}");
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.WRONG_NUMBER_OF_PARAMETERS_FOR_SETTER]);
     verify([source]);
   }
+
   void test_wrongNumberOfParametersForSetter_function_tooFew() {
     Source source = addSource("set x() {}");
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.WRONG_NUMBER_OF_PARAMETERS_FOR_SETTER]);
     verify([source]);
   }
+
   void test_wrongNumberOfParametersForSetter_function_tooMany() {
     Source source = addSource("set x(a, b) {}");
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.WRONG_NUMBER_OF_PARAMETERS_FOR_SETTER]);
     verify([source]);
   }
+
   void test_wrongNumberOfParametersForSetter_method_named() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  set x({p}) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.WRONG_NUMBER_OF_PARAMETERS_FOR_SETTER]);
     verify([source]);
   }
+
   void test_wrongNumberOfParametersForSetter_method_optional() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  set x([p]) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.WRONG_NUMBER_OF_PARAMETERS_FOR_SETTER]);
     verify([source]);
   }
+
   void test_wrongNumberOfParametersForSetter_method_tooFew() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  set x() {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.WRONG_NUMBER_OF_PARAMETERS_FOR_SETTER]);
     verify([source]);
   }
+
   void test_wrongNumberOfParametersForSetter_method_tooMany() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  set x(a, b) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.WRONG_NUMBER_OF_PARAMETERS_FOR_SETTER]);
     verify([source]);
   }
+
   void check_constEvalThrowsException_binary_null(String expr, bool resolved) {
     Source source = addSource("const C = ${expr};");
     resolve(source);
     if (resolved) {
       assertErrors(source, [CompileTimeErrorCode.CONST_EVAL_THROWS_EXCEPTION]);
       verify([source]);
     } else {
       assertErrors(source, [CompileTimeErrorCode.CONST_EVAL_THROWS_EXCEPTION]);
     }
     reset();
   }
+
   void check_constEvalTypeBool_withParameter_binary(String expr) {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final a;",
         "  const A(bool p) : a = ${expr};",
         "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.CONST_EVAL_TYPE_BOOL]);
     verify([source]);
     reset();
   }
+
   void check_constEvalTypeInt_withParameter_binary(String expr) {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final a;",
         "  const A(int p) : a = ${expr};",
         "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.CONST_EVAL_TYPE_INT,
         StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
     reset();
   }
+
   void check_constEvalTypeNum_withParameter_binary(String expr) {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final a;",
         "  const A(num p) : a = ${expr};",
         "}"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.CONST_EVAL_TYPE_NUM,
         StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
     reset();
   }
+
   void check_wrongNumberOfParametersForOperator(String name, String parameters) {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  operator ${name}(${parameters}) {}", "}"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.WRONG_NUMBER_OF_PARAMETERS_FOR_OPERATOR]);
     verify([source]);
     reset();
   }
+
   void check_wrongNumberOfParametersForOperator1(String name) {
     check_wrongNumberOfParametersForOperator(name, "");
     check_wrongNumberOfParametersForOperator(name, "a, b");
   }
+
   static dartSuite() {
     _ut.group('CompileTimeErrorCodeTest', () {
       _ut.test('test_ambiguousExport', () {
         final __test = new CompileTimeErrorCodeTest();
         runJUnitTest(__test, __test.test_ambiguousExport);
       });
       _ut.test('test_ambiguousImport_function', () {
         final __test = new CompileTimeErrorCodeTest();
         runJUnitTest(__test, __test.test_ambiguousImport_function);
       });
@@ skipping 1070 matching lines @@
         runJUnitTest(__test, __test.test_referencedBeforeDeclaration_hideInBlock_function);
       });
       _ut.test('test_referencedBeforeDeclaration_hideInBlock_local', () {
         final __test = new CompileTimeErrorCodeTest();
         runJUnitTest(__test, __test.test_referencedBeforeDeclaration_hideInBlock_local);
       });
       _ut.test('test_referencedBeforeDeclaration_hideInBlock_subBlock', () {
         final __test = new CompileTimeErrorCodeTest();
         runJUnitTest(__test, __test.test_referencedBeforeDeclaration_hideInBlock_subBlock);
       });
+      _ut.test('test_referencedBeforeDeclaration_inInitializer_closure', () {
+        final __test = new CompileTimeErrorCodeTest();
+        runJUnitTest(__test, __test.test_referencedBeforeDeclaration_inInitializer_closure);
+      });
+      _ut.test('test_referencedBeforeDeclaration_inInitializer_directly', () {
+        final __test = new CompileTimeErrorCodeTest();
+        runJUnitTest(__test, __test.test_referencedBeforeDeclaration_inInitializer_directly);
+      });
       _ut.test('test_rethrowOutsideCatch', () {
         final __test = new CompileTimeErrorCodeTest();
         runJUnitTest(__test, __test.test_rethrowOutsideCatch);
       });
       _ut.test('test_returnInGenerativeConstructor', () {
         final __test = new CompileTimeErrorCodeTest();
         runJUnitTest(__test, __test.test_returnInGenerativeConstructor);
       });
       _ut.test('test_returnInGenerativeConstructor_expressionFunctionBody', () {
         final __test = new CompileTimeErrorCodeTest();
@@ skipping 175 matching lines @@
         final __test = new CompileTimeErrorCodeTest();
         runJUnitTest(__test, __test.test_wrongNumberOfParametersForSetter_method_tooFew);
       });
       _ut.test('test_wrongNumberOfParametersForSetter_method_tooMany', () {
         final __test = new CompileTimeErrorCodeTest();
         runJUnitTest(__test, __test.test_wrongNumberOfParametersForSetter_method_tooMany);
       });
     });
   }
 }
+
 /**
  * Instances of the class `StaticTypeVerifier` verify that all of the nodes in an AST
  * structure that should have a static type associated with them do have a static type.
  */
 class StaticTypeVerifier extends GeneralizingASTVisitor<Object> {
-
   /**
    * A list containing all of the AST Expression nodes that were not resolved.
    */
   List<Expression> _unresolvedExpressions = new List<Expression>();
 
   /**
    * A list containing all of the AST Expression nodes for which a propagated type was computed but
    * where that type was not more specific than the static type.
    */
   List<Expression> _invalidlyPropagatedExpressions = new List<Expression>();
@@ skipping 76 matching lines @@
           writer.print("    ");
           writer.print(getFileName(expression));
           writer.print(" : ");
           writer.print(expression.offset);
           writer.println(")");
         }
       }
       JUnitTestCase.fail(writer.toString());
     }
   }
+
   Object visitBreakStatement(BreakStatement node) => null;
+
   Object visitCommentReference(CommentReference node) => null;
+
   Object visitContinueStatement(ContinueStatement node) => null;
+
   Object visitExportDirective(ExportDirective node) => null;
+
   Object visitExpression(Expression node) {
     node.visitChildren(this);
     Type2 staticType = node.staticType;
     if (staticType == null) {
       _unresolvedExpressions.add(node);
     } else {
       _resolvedExpressionCount++;
       Type2 propagatedType = node.propagatedType;
       if (propagatedType != null) {
         _propagatedExpressionCount++;
         if (!propagatedType.isMoreSpecificThan(staticType)) {
           _invalidlyPropagatedExpressions.add(node);
         }
       }
     }
     return null;
   }
+
   Object visitImportDirective(ImportDirective node) => null;
+
   Object visitLabel(Label node) => null;
+
   Object visitLibraryIdentifier(LibraryIdentifier node) => null;
+
   Object visitPrefixedIdentifier(PrefixedIdentifier node) {
     if (node.staticType == null && identical(node.prefix.staticType, DynamicTypeImpl.instance)) {
       return null;
     }
     return super.visitPrefixedIdentifier(node);
   }
+
   Object visitSimpleIdentifier(SimpleIdentifier node) {
     ASTNode parent = node.parent;
-    if (parent is MethodInvocation && identical(node, ((parent as MethodInvocation)).methodName)) {
+    if (parent is MethodInvocation && identical(node, (parent as MethodInvocation).methodName)) {
       return null;
-    } else if (parent is RedirectingConstructorInvocation && identical(node, ((parent as RedirectingConstructorInvocation)).constructorName)) {
+    } else if (parent is RedirectingConstructorInvocation && identical(node, (parent as RedirectingConstructorInvocation).constructorName)) {
       return null;
-    } else if (parent is SuperConstructorInvocation && identical(node, ((parent as SuperConstructorInvocation)).constructorName)) {
+    } else if (parent is SuperConstructorInvocation && identical(node, (parent as SuperConstructorInvocation).constructorName)) {
       return null;
-    } else if (parent is ConstructorName && identical(node, ((parent as ConstructorName)).name)) {
+    } else if (parent is ConstructorName && identical(node, (parent as ConstructorName).name)) {
       return null;
-    } else if (parent is ConstructorFieldInitializer && identical(node, ((parent as ConstructorFieldInitializer)).fieldName)) {
+    } else if (parent is ConstructorFieldInitializer && identical(node, (parent as ConstructorFieldInitializer).fieldName)) {
       return null;
     } else if (node.staticElement is PrefixElement) {
       return null;
     }
     return super.visitSimpleIdentifier(node);
   }
+
   Object visitTypeName(TypeName node) {
     if (node.type == null) {
       _unresolvedTypes.add(node);
     } else {
       _resolvedTypeCount++;
     }
     return null;
   }
+
   String getFileName(ASTNode node) {
     if (node != null) {
       ASTNode root = node.root;
       if (root is CompilationUnit) {
         CompilationUnit rootCU = root as CompilationUnit;
         if (rootCU.element != null) {
           return rootCU.element.source.fullName;
         } else {
           return "<unknown file- CompilationUnit.getElement() returned null>";
         }
       } else {
         return "<unknown file- CompilationUnit.getRoot() is not a CompilationUnit>";
       }
     }
     return "<unknown file- ASTNode is null>";
   }
 }
+
 /**
  * The class `StrictModeTest` contains tests to ensure that the correct errors and warnings
  * are reported when the analysis engine is run in strict mode.
  */
 class StrictModeTest extends ResolverTestCase {
   void fail_for() {
     Source source = addSource(EngineTestCase.createSource([
         "int f(List<int> list) {",
         "  num sum = 0;",
         "  for (num i = 0; i < list.length; i++) {",
         "    sum += list[i];",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   void setUp() {
     super.setUp();
     AnalysisOptionsImpl options = new AnalysisOptionsImpl();
     options.strictMode = true;
     options.hint = false;
     analysisContext.analysisOptions = options;
   }
+
   void test_assert_is() {
     Source source = addSource(EngineTestCase.createSource([
         "int f(num n) {",
         "  assert (n is int);",
         "  return n & 0x0F;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   void test_conditional_and_is() {
     Source source = addSource(EngineTestCase.createSource([
         "int f(num n) {",
         "  return (n is int && n > 0) ? n & 0x0F : 0;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_conditional_is() {
     Source source = addSource(EngineTestCase.createSource([
         "int f(num n) {",
         "  return (n is int) ? n & 0x0F : 0;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_conditional_isNot() {
     Source source = addSource(EngineTestCase.createSource([
         "int f(num n) {",
         "  return (n is! int) ? 0 : n & 0x0F;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   void test_conditional_or_is() {
     Source source = addSource(EngineTestCase.createSource([
         "int f(num n) {",
         "  return (n is! int || n < 0) ? 0 : n & 0x0F;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   void test_forEach() {
     Source source = addSource(EngineTestCase.createSource([
         "int f(List<int> list) {",
         "  num sum = 0;",
         "  for (num n in list) {",
         "    sum += n & 0x0F;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   void test_if_and_is() {
     Source source = addSource(EngineTestCase.createSource([
         "int f(num n) {",
         "  if (n is int && n > 0) {",
         "    return n & 0x0F;",
         "  }",
         "  return 0;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_if_is() {
     Source source = addSource(EngineTestCase.createSource([
         "int f(num n) {",
         "  if (n is int) {",
         "    return n & 0x0F;",
         "  }",
         "  return 0;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_if_isNot() {
     Source source = addSource(EngineTestCase.createSource([
         "int f(num n) {",
         "  if (n is! int) {",
         "    return 0;",
         "  } else {",
         "    return n & 0x0F;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   void test_if_isNot_abrupt() {
     Source source = addSource(EngineTestCase.createSource([
         "int f(num n) {",
         "  if (n is! int) {",
         "    return 0;",
         "  }",
         "  return n & 0x0F;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   void test_if_or_is() {
     Source source = addSource(EngineTestCase.createSource([
         "int f(num n) {",
         "  if (n is! int || n < 0) {",
         "    return 0;",
         "  } else {",
         "    return n & 0x0F;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   void test_localVar() {
     Source source = addSource(EngineTestCase.createSource(["int f() {", "  num n = 1234;", "  return n & 0x0F;", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]);
   }
+
   static dartSuite() {
     _ut.group('StrictModeTest', () {
       _ut.test('test_assert_is', () {
         final __test = new StrictModeTest();
         runJUnitTest(__test, __test.test_assert_is);
       });
       _ut.test('test_conditional_and_is', () {
         final __test = new StrictModeTest();
         runJUnitTest(__test, __test.test_conditional_and_is);
       });
@@ skipping 33 matching lines @@
         final __test = new StrictModeTest();
         runJUnitTest(__test, __test.test_if_or_is);
       });
       _ut.test('test_localVar', () {
         final __test = new StrictModeTest();
         runJUnitTest(__test, __test.test_localVar);
       });
     });
   }
 }
+
 class ElementResolverTest extends EngineTestCase {
-
   /**
    * The error listener to which errors will be reported.
    */
   GatheringErrorListener _listener;
 
   /**
    * The type provider used to access the types.
    */
   TestTypeProvider _typeProvider;
 
   /**
    * The library containing the code being resolved.
    */
   LibraryElementImpl _definingLibrary;
 
   /**
    * The resolver visitor that maintains the state for the resolver.
    */
   ResolverVisitor _visitor;
 
   /**
    * The resolver being used to resolve the test cases.
    */
   ElementResolver _resolver;
+
   void fail_visitExportDirective_combinators() {
     JUnitTestCase.fail("Not yet tested");
     ExportDirective directive = ASTFactory.exportDirective2(null, [ASTFactory.hideCombinator2(["A"])]);
     resolveNode(directive, []);
     _listener.assertNoErrors();
   }
+
   void fail_visitFunctionExpressionInvocation() {
     JUnitTestCase.fail("Not yet tested");
     _listener.assertNoErrors();
   }
+
   void fail_visitImportDirective_combinators_noPrefix() {
     JUnitTestCase.fail("Not yet tested");
     ImportDirective directive = ASTFactory.importDirective2(null, null, [ASTFactory.showCombinator2(["A"])]);
     resolveNode(directive, []);
     _listener.assertNoErrors();
   }
+
   void fail_visitImportDirective_combinators_prefix() {
     JUnitTestCase.fail("Not yet tested");
     String prefixName = "p";
     _definingLibrary.imports = <ImportElement> [ElementFactory.importFor(null, ElementFactory.prefix(prefixName), [])];
     ImportDirective directive = ASTFactory.importDirective2(null, prefixName, [
         ASTFactory.showCombinator2(["A"]),
         ASTFactory.hideCombinator2(["B"])]);
     resolveNode(directive, []);
     _listener.assertNoErrors();
   }
+
   void fail_visitRedirectingConstructorInvocation() {
     JUnitTestCase.fail("Not yet tested");
     _listener.assertNoErrors();
   }
+
   void setUp() {
     _listener = new GatheringErrorListener();
     _typeProvider = new TestTypeProvider();
     _resolver = createResolver();
   }
+
   void test_lookUpMethodInInterfaces() {
     InterfaceType intType = _typeProvider.intType;
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     MethodElement operator = ElementFactory.methodElement("[]", intType, [intType]);
     classA.methods = <MethodElement> [operator];
     ClassElementImpl classB = ElementFactory.classElement2("B", []);
     classB.interfaces = <InterfaceType> [classA.type];
     ClassElementImpl classC = ElementFactory.classElement2("C", []);
     classC.mixins = <InterfaceType> [classB.type];
     ClassElementImpl classD = ElementFactory.classElement("D", classC.type, []);
     SimpleIdentifier array = ASTFactory.identifier3("a");
     array.staticType = classD.type;
     IndexExpression expression = ASTFactory.indexExpression(array, ASTFactory.identifier3("i"));
     JUnitTestCase.assertSame(operator, resolve5(expression, []));
     _listener.assertNoErrors();
   }
+
   void test_visitAssignmentExpression_compound() {
     InterfaceType intType = _typeProvider.intType;
     SimpleIdentifier leftHandSide = ASTFactory.identifier3("a");
     leftHandSide.staticType = intType;
     AssignmentExpression assignment = ASTFactory.assignmentExpression(leftHandSide, TokenType.PLUS_EQ, ASTFactory.integer(1));
     resolveNode(assignment, []);
     JUnitTestCase.assertSame(getMethod(_typeProvider.numType, "+"), assignment.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitAssignmentExpression_simple() {
     AssignmentExpression expression = ASTFactory.assignmentExpression(ASTFactory.identifier3("x"), TokenType.EQ, ASTFactory.integer(0));
     resolveNode(expression, []);
     JUnitTestCase.assertNull(expression.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitBinaryExpression() {
     InterfaceType numType = _typeProvider.numType;
     SimpleIdentifier left = ASTFactory.identifier3("i");
     left.staticType = numType;
     BinaryExpression expression = ASTFactory.binaryExpression(left, TokenType.PLUS, ASTFactory.identifier3("j"));
     resolveNode(expression, []);
     JUnitTestCase.assertEquals(getMethod(numType, "+"), expression.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitBreakStatement_withLabel() {
     String label = "loop";
     LabelElementImpl labelElement = new LabelElementImpl(ASTFactory.identifier3(label), false, false);
     BreakStatement statement = ASTFactory.breakStatement2(label);
     JUnitTestCase.assertSame(labelElement, resolve(statement, labelElement));
     _listener.assertNoErrors();
   }
+
   void test_visitBreakStatement_withoutLabel() {
     BreakStatement statement = ASTFactory.breakStatement();
     resolveStatement(statement, null);
     _listener.assertNoErrors();
   }
+
   void test_visitConstructorName_named() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String constructorName = "a";
-    ConstructorElement constructor = ElementFactory.constructorElement(classA, constructorName);
+    ConstructorElement constructor = ElementFactory.constructorElement2(classA, constructorName, []);
     classA.constructors = <ConstructorElement> [constructor];
     ConstructorName name = ASTFactory.constructorName(ASTFactory.typeName(classA, []), constructorName);
     resolveNode(name, []);
     JUnitTestCase.assertSame(constructor, name.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitConstructorName_unnamed() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String constructorName = null;
-    ConstructorElement constructor = ElementFactory.constructorElement(classA, constructorName);
+    ConstructorElement constructor = ElementFactory.constructorElement2(classA, constructorName, []);
     classA.constructors = <ConstructorElement> [constructor];
     ConstructorName name = ASTFactory.constructorName(ASTFactory.typeName(classA, []), constructorName);
     resolveNode(name, []);
     JUnitTestCase.assertSame(constructor, name.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitContinueStatement_withLabel() {
     String label = "loop";
     LabelElementImpl labelElement = new LabelElementImpl(ASTFactory.identifier3(label), false, false);
     ContinueStatement statement = ASTFactory.continueStatement2(label);
     JUnitTestCase.assertSame(labelElement, resolve3(statement, labelElement));
     _listener.assertNoErrors();
   }
+
   void test_visitContinueStatement_withoutLabel() {
     ContinueStatement statement = ASTFactory.continueStatement();
     resolveStatement(statement, null);
     _listener.assertNoErrors();
   }
+
   void test_visitExportDirective_noCombinators() {
     ExportDirective directive = ASTFactory.exportDirective2(null, []);
     directive.element = ElementFactory.exportFor(ElementFactory.library(_definingLibrary.context, "lib"), []);
     resolveNode(directive, []);
     _listener.assertNoErrors();
   }
+
   void test_visitFieldFormalParameter() {
     InterfaceType intType = _typeProvider.intType;
     String fieldName = "f";
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     classA.fields = <FieldElement> [ElementFactory.fieldElement(fieldName, false, false, false, intType)];
     FieldFormalParameter parameter = ASTFactory.fieldFormalParameter3(fieldName);
     parameter.identifier.staticElement = ElementFactory.fieldFormalParameter(parameter.identifier);
     resolveInClass(parameter, classA);
     JUnitTestCase.assertSame(intType, parameter.element.type);
   }
+
   void test_visitImportDirective_noCombinators_noPrefix() {
     ImportDirective directive = ASTFactory.importDirective2(null, null, []);
     directive.element = ElementFactory.importFor(ElementFactory.library(_definingLibrary.context, "lib"), null, []);
     resolveNode(directive, []);
     _listener.assertNoErrors();
   }
+
   void test_visitImportDirective_noCombinators_prefix() {
     String prefixName = "p";
     ImportElement importElement = ElementFactory.importFor(ElementFactory.library(_definingLibrary.context, "lib"), ElementFactory.prefix(prefixName), []);
     _definingLibrary.imports = <ImportElement> [importElement];
     ImportDirective directive = ASTFactory.importDirective2(null, prefixName, []);
     directive.element = importElement;
     resolveNode(directive, []);
     _listener.assertNoErrors();
   }
+
   void test_visitIndexExpression_get() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     InterfaceType intType = _typeProvider.intType;
     MethodElement getter = ElementFactory.methodElement("[]", intType, [intType]);
     classA.methods = <MethodElement> [getter];
     SimpleIdentifier array = ASTFactory.identifier3("a");
     array.staticType = classA.type;
     IndexExpression expression = ASTFactory.indexExpression(array, ASTFactory.identifier3("i"));
     JUnitTestCase.assertSame(getter, resolve5(expression, []));
     _listener.assertNoErrors();
   }
+
   void test_visitIndexExpression_set() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     InterfaceType intType = _typeProvider.intType;
     MethodElement setter = ElementFactory.methodElement("[]=", intType, [intType]);
     classA.methods = <MethodElement> [setter];
     SimpleIdentifier array = ASTFactory.identifier3("a");
     array.staticType = classA.type;
     IndexExpression expression = ASTFactory.indexExpression(array, ASTFactory.identifier3("i"));
     ASTFactory.assignmentExpression(expression, TokenType.EQ, ASTFactory.integer(0));
     JUnitTestCase.assertSame(setter, resolve5(expression, []));
     _listener.assertNoErrors();
   }
+
   void test_visitInstanceCreationExpression_named() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String constructorName = "a";
-    ConstructorElement constructor = ElementFactory.constructorElement(classA, constructorName);
+    ConstructorElement constructor = ElementFactory.constructorElement2(classA, constructorName, []);
     classA.constructors = <ConstructorElement> [constructor];
     ConstructorName name = ASTFactory.constructorName(ASTFactory.typeName(classA, []), constructorName);
     name.staticElement = constructor;
     InstanceCreationExpression creation = ASTFactory.instanceCreationExpression(Keyword.NEW, name, []);
     resolveNode(creation, []);
     JUnitTestCase.assertSame(constructor, creation.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitInstanceCreationExpression_unnamed() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String constructorName = null;
-    ConstructorElement constructor = ElementFactory.constructorElement(classA, constructorName);
+    ConstructorElement constructor = ElementFactory.constructorElement2(classA, constructorName, []);
     classA.constructors = <ConstructorElement> [constructor];
     ConstructorName name = ASTFactory.constructorName(ASTFactory.typeName(classA, []), constructorName);
     name.staticElement = constructor;
     InstanceCreationExpression creation = ASTFactory.instanceCreationExpression(Keyword.NEW, name, []);
     resolveNode(creation, []);
     JUnitTestCase.assertSame(constructor, creation.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitInstanceCreationExpression_unnamed_namedParameter() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String constructorName = null;
-    ConstructorElementImpl constructor = ElementFactory.constructorElement(classA, constructorName);
+    ConstructorElementImpl constructor = ElementFactory.constructorElement2(classA, constructorName, []);
     String parameterName = "a";
     ParameterElement parameter = ElementFactory.namedParameter(parameterName);
     constructor.parameters = <ParameterElement> [parameter];
     classA.constructors = <ConstructorElement> [constructor];
     ConstructorName name = ASTFactory.constructorName(ASTFactory.typeName(classA, []), constructorName);
     name.staticElement = constructor;
     InstanceCreationExpression creation = ASTFactory.instanceCreationExpression(Keyword.NEW, name, [ASTFactory.namedExpression2(parameterName, ASTFactory.integer(0))]);
     resolveNode(creation, []);
     JUnitTestCase.assertSame(constructor, creation.staticElement);
-    JUnitTestCase.assertSame(parameter, ((creation.argumentList.arguments[0] as NamedExpression)).name.label.staticElement);
+    JUnitTestCase.assertSame(parameter, (creation.argumentList.arguments[0] as NamedExpression).name.label.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitMethodInvocation() {
     InterfaceType numType = _typeProvider.numType;
     SimpleIdentifier left = ASTFactory.identifier3("i");
     left.staticType = numType;
     String methodName = "abs";
     MethodInvocation invocation = ASTFactory.methodInvocation(left, methodName, []);
     resolveNode(invocation, []);
     JUnitTestCase.assertSame(getMethod(numType, methodName), invocation.methodName.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitMethodInvocation_namedParameter() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String methodName = "m";
     String parameterName = "p";
     MethodElementImpl method = ElementFactory.methodElement(methodName, null, []);
     ParameterElement parameter = ElementFactory.namedParameter(parameterName);
     method.parameters = <ParameterElement> [parameter];
     classA.methods = <MethodElement> [method];
     SimpleIdentifier left = ASTFactory.identifier3("i");
     left.staticType = classA.type;
     MethodInvocation invocation = ASTFactory.methodInvocation(left, methodName, [ASTFactory.namedExpression2(parameterName, ASTFactory.integer(0))]);
     resolveNode(invocation, []);
     JUnitTestCase.assertSame(method, invocation.methodName.staticElement);
-    JUnitTestCase.assertSame(parameter, ((invocation.argumentList.arguments[0] as NamedExpression)).name.label.staticElement);
+    JUnitTestCase.assertSame(parameter, (invocation.argumentList.arguments[0] as NamedExpression).name.label.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitPostfixExpression() {
     InterfaceType numType = _typeProvider.numType;
     SimpleIdentifier operand = ASTFactory.identifier3("i");
     operand.staticType = numType;
     PostfixExpression expression = ASTFactory.postfixExpression(operand, TokenType.PLUS_PLUS);
     resolveNode(expression, []);
     JUnitTestCase.assertEquals(getMethod(numType, "+"), expression.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitPrefixedIdentifier_dynamic() {
     Type2 dynamicType = _typeProvider.dynamicType;
     SimpleIdentifier target = ASTFactory.identifier3("a");
     VariableElementImpl variable = ElementFactory.localVariableElement(target);
     variable.type = dynamicType;
     target.staticElement = variable;
     target.staticType = dynamicType;
     PrefixedIdentifier identifier = ASTFactory.identifier(target, ASTFactory.identifier3("b"));
     resolveNode(identifier, []);
     JUnitTestCase.assertNull(identifier.staticElement);
     JUnitTestCase.assertNull(identifier.identifier.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitPrefixedIdentifier_nonDynamic() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String getterName = "b";
     PropertyAccessorElement getter = ElementFactory.getterElement(getterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [getter];
     SimpleIdentifier target = ASTFactory.identifier3("a");
     VariableElementImpl variable = ElementFactory.localVariableElement(target);
     variable.type = classA.type;
     target.staticElement = variable;
     target.staticType = classA.type;
     PrefixedIdentifier identifier = ASTFactory.identifier(target, ASTFactory.identifier3(getterName));
     resolveNode(identifier, []);
     JUnitTestCase.assertSame(getter, identifier.staticElement);
     JUnitTestCase.assertSame(getter, identifier.identifier.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitPrefixExpression() {
     InterfaceType numType = _typeProvider.numType;
     SimpleIdentifier operand = ASTFactory.identifier3("i");
     operand.staticType = numType;
     PrefixExpression expression = ASTFactory.prefixExpression(TokenType.PLUS_PLUS, operand);
     resolveNode(expression, []);
     JUnitTestCase.assertEquals(getMethod(numType, "+"), expression.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitPropertyAccess_getter_identifier() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String getterName = "b";
     PropertyAccessorElement getter = ElementFactory.getterElement(getterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [getter];
     SimpleIdentifier target = ASTFactory.identifier3("a");
     target.staticType = classA.type;
     PropertyAccess access = ASTFactory.propertyAccess2(target, getterName);
     resolveNode(access, []);
     JUnitTestCase.assertSame(getter, access.propertyName.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitPropertyAccess_getter_super() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String getterName = "b";
     PropertyAccessorElement getter = ElementFactory.getterElement(getterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [getter];
     SuperExpression target = ASTFactory.superExpression();
     target.staticType = ElementFactory.classElement("B", classA.type, []).type;
     PropertyAccess access = ASTFactory.propertyAccess2(target, getterName);
     ASTFactory.methodDeclaration2(null, null, null, null, ASTFactory.identifier3("m"), ASTFactory.formalParameterList([]), ASTFactory.expressionFunctionBody(access));
     resolveNode(access, []);
     JUnitTestCase.assertSame(getter, access.propertyName.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitPropertyAccess_setter_this() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String setterName = "b";
     PropertyAccessorElement setter = ElementFactory.setterElement(setterName, false, _typeProvider.intType);
     classA.accessors = <PropertyAccessorElement> [setter];
     ThisExpression target = ASTFactory.thisExpression();
     target.staticType = classA.type;
     PropertyAccess access = ASTFactory.propertyAccess2(target, setterName);
     ASTFactory.assignmentExpression(access, TokenType.EQ, ASTFactory.integer(0));
     resolveNode(access, []);
     JUnitTestCase.assertSame(setter, access.propertyName.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitSimpleIdentifier_classScope() {
     InterfaceType doubleType = _typeProvider.doubleType;
     String fieldName = "NAN";
     SimpleIdentifier node = ASTFactory.identifier3(fieldName);
     resolveInClass(node, doubleType.element);
     JUnitTestCase.assertEquals(getGetter(doubleType, fieldName), node.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitSimpleIdentifier_dynamic() {
     SimpleIdentifier node = ASTFactory.identifier3("dynamic");
     resolve4(node, []);
     JUnitTestCase.assertSame(_typeProvider.dynamicType.element, node.staticElement);
     JUnitTestCase.assertSame(_typeProvider.typeType, node.staticType);
     _listener.assertNoErrors();
   }
+
   void test_visitSimpleIdentifier_lexicalScope() {
     SimpleIdentifier node = ASTFactory.identifier3("i");
     VariableElementImpl element = ElementFactory.localVariableElement(node);
     JUnitTestCase.assertSame(element, resolve4(node, [element]));
     _listener.assertNoErrors();
   }
+
   void test_visitSimpleIdentifier_lexicalScope_field_setter() {
     InterfaceType intType = _typeProvider.intType;
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     String fieldName = "a";
     FieldElement field = ElementFactory.fieldElement(fieldName, false, false, false, intType);
     classA.fields = <FieldElement> [field];
     classA.accessors = <PropertyAccessorElement> [field.getter, field.setter];
     SimpleIdentifier node = ASTFactory.identifier3(fieldName);
     ASTFactory.assignmentExpression(node, TokenType.EQ, ASTFactory.integer(0));
     resolveInClass(node, classA);
     Element element = node.staticElement;
     EngineTestCase.assertInstanceOf(PropertyAccessorElement, element);
-    JUnitTestCase.assertTrue(((element as PropertyAccessorElement)).isSetter);
+    JUnitTestCase.assertTrue((element as PropertyAccessorElement).isSetter);
     _listener.assertNoErrors();
   }
+
   void test_visitSuperConstructorInvocation() {
     ClassElementImpl superclass = ElementFactory.classElement2("A", []);
-    ConstructorElementImpl superConstructor = ElementFactory.constructorElement(superclass, null);
+    ConstructorElementImpl superConstructor = ElementFactory.constructorElement2(superclass, null, []);
     superclass.constructors = <ConstructorElement> [superConstructor];
     ClassElementImpl subclass = ElementFactory.classElement("B", superclass.type, []);
-    ConstructorElementImpl subConstructor = ElementFactory.constructorElement(subclass, null);
+    ConstructorElementImpl subConstructor = ElementFactory.constructorElement2(subclass, null, []);
     subclass.constructors = <ConstructorElement> [subConstructor];
     SuperConstructorInvocation invocation = ASTFactory.superConstructorInvocation([]);
     resolveInClass(invocation, subclass);
     JUnitTestCase.assertEquals(superConstructor, invocation.staticElement);
     _listener.assertNoErrors();
   }
+
   void test_visitSuperConstructorInvocation_namedParameter() {
     ClassElementImpl superclass = ElementFactory.classElement2("A", []);
-    ConstructorElementImpl superConstructor = ElementFactory.constructorElement(superclass, null);
+    ConstructorElementImpl superConstructor = ElementFactory.constructorElement2(superclass, null, []);
     String parameterName = "p";
     ParameterElement parameter = ElementFactory.namedParameter(parameterName);
     superConstructor.parameters = <ParameterElement> [parameter];
     superclass.constructors = <ConstructorElement> [superConstructor];
     ClassElementImpl subclass = ElementFactory.classElement("B", superclass.type, []);
-    ConstructorElementImpl subConstructor = ElementFactory.constructorElement(subclass, null);
+    ConstructorElementImpl subConstructor = ElementFactory.constructorElement2(subclass, null, []);
     subclass.constructors = <ConstructorElement> [subConstructor];
     SuperConstructorInvocation invocation = ASTFactory.superConstructorInvocation([ASTFactory.namedExpression2(parameterName, ASTFactory.integer(0))]);
     resolveInClass(invocation, subclass);
     JUnitTestCase.assertEquals(superConstructor, invocation.staticElement);
-    JUnitTestCase.assertSame(parameter, ((invocation.argumentList.arguments[0] as NamedExpression)).name.label.staticElement);
+    JUnitTestCase.assertSame(parameter, (invocation.argumentList.arguments[0] as NamedExpression).name.label.staticElement);
     _listener.assertNoErrors();
   }
 
   /**
    * Create the resolver used by the tests.
    *
    * @return the resolver that was created
    */
   ElementResolver createResolver() {
     AnalysisContextImpl context = new AnalysisContextImpl();
@@ skipping 141 matching lines @@
         }
         _visitor.labelScope_J2DAccessor = innerScope;
         statement.accept(_resolver);
       } finally {
         _visitor.labelScope_J2DAccessor = outerScope;
       }
     } on JavaException catch (exception) {
       throw new IllegalArgumentException("Could not resolve node", exception);
     }
   }
+
   static dartSuite() {
     _ut.group('ElementResolverTest', () {
       _ut.test('test_lookUpMethodInInterfaces', () {
         final __test = new ElementResolverTest();
         runJUnitTest(__test, __test.test_lookUpMethodInInterfaces);
       });
       _ut.test('test_visitAssignmentExpression_compound', () {
         final __test = new ElementResolverTest();
         runJUnitTest(__test, __test.test_visitAssignmentExpression_compound);
       });
@@ skipping 121 matching lines @@
         final __test = new ElementResolverTest();
         runJUnitTest(__test, __test.test_visitSuperConstructorInvocation);
       });
       _ut.test('test_visitSuperConstructorInvocation_namedParameter', () {
         final __test = new ElementResolverTest();
         runJUnitTest(__test, __test.test_visitSuperConstructorInvocation_namedParameter);
       });
     });
   }
 }
+
 class TypeOverrideManagerTest extends EngineTestCase {
   void test_exitScope_noScopes() {
     TypeOverrideManager manager = new TypeOverrideManager();
     try {
       manager.exitScope();
       JUnitTestCase.fail("Expected IllegalStateException");
     } on IllegalStateException catch (exception) {
     }
   }
+
   void test_exitScope_oneScope() {
     TypeOverrideManager manager = new TypeOverrideManager();
     manager.enterScope();
     manager.exitScope();
     try {
       manager.exitScope();
       JUnitTestCase.fail("Expected IllegalStateException");
     } on IllegalStateException catch (exception) {
     }
   }
+
   void test_exitScope_twoScopes() {
     TypeOverrideManager manager = new TypeOverrideManager();
     manager.enterScope();
     manager.exitScope();
     manager.enterScope();
     manager.exitScope();
     try {
       manager.exitScope();
       JUnitTestCase.fail("Expected IllegalStateException");
     } on IllegalStateException catch (exception) {
     }
   }
+
   void test_getType_enclosedOverride() {
     TypeOverrideManager manager = new TypeOverrideManager();
     LocalVariableElementImpl element = ElementFactory.localVariableElement2("v");
     InterfaceType type = ElementFactory.classElement2("C", []).type;
     manager.enterScope();
     manager.setType(element, type);
     manager.enterScope();
     JUnitTestCase.assertSame(type, manager.getType(element));
   }
+
   void test_getType_immediateOverride() {
     TypeOverrideManager manager = new TypeOverrideManager();
     LocalVariableElementImpl element = ElementFactory.localVariableElement2("v");
     InterfaceType type = ElementFactory.classElement2("C", []).type;
     manager.enterScope();
     manager.setType(element, type);
     JUnitTestCase.assertSame(type, manager.getType(element));
   }
+
   void test_getType_noOverride() {
     TypeOverrideManager manager = new TypeOverrideManager();
     manager.enterScope();
     JUnitTestCase.assertNull(manager.getType(ElementFactory.localVariableElement2("v")));
   }
+
   void test_getType_noScope() {
     TypeOverrideManager manager = new TypeOverrideManager();
     JUnitTestCase.assertNull(manager.getType(ElementFactory.localVariableElement2("v")));
   }
+
   static dartSuite() {
     _ut.group('TypeOverrideManagerTest', () {
       _ut.test('test_exitScope_noScopes', () {
         final __test = new TypeOverrideManagerTest();
         runJUnitTest(__test, __test.test_exitScope_noScopes);
       });
       _ut.test('test_exitScope_oneScope', () {
         final __test = new TypeOverrideManagerTest();
         runJUnitTest(__test, __test.test_exitScope_oneScope);
       });
@@ skipping 13 matching lines @@
         final __test = new TypeOverrideManagerTest();
         runJUnitTest(__test, __test.test_getType_noOverride);
       });
       _ut.test('test_getType_noScope', () {
         final __test = new TypeOverrideManagerTest();
         runJUnitTest(__test, __test.test_getType_noScope);
       });
     });
   }
 }
+
 class PubSuggestionCodeTest extends ResolverTestCase {
   void test_import_package() {
     Source source = addSource(EngineTestCase.createSource(["import 'package:somepackage/other.dart';"]));
     resolve(source);
     assertErrors(source, [CompileTimeErrorCode.URI_DOES_NOT_EXIST]);
   }
+
   void test_import_packageWithDotDot() {
     Source source = addSource(EngineTestCase.createSource(["import 'package:somepackage/../other.dart';"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.URI_DOES_NOT_EXIST,
         PubSuggestionCode.PACKAGE_IMPORT_CONTAINS_DOT_DOT]);
   }
+
   void test_import_packageWithLeadingDotDot() {
     Source source = addSource(EngineTestCase.createSource(["import 'package:../other.dart';"]));
     resolve(source);
     assertErrors(source, [
         CompileTimeErrorCode.URI_DOES_NOT_EXIST,
         PubSuggestionCode.PACKAGE_IMPORT_CONTAINS_DOT_DOT]);
   }
+
   void test_import_referenceIntoLibDirectory() {
     cacheSource("/myproj/pubspec.yaml", "");
     cacheSource("/myproj/lib/other.dart", "");
     Source source = addSource2("/myproj/web/test.dart", EngineTestCase.createSource(["import '../lib/other.dart';"]));
     resolve(source);
     assertErrors(source, [PubSuggestionCode.FILE_IMPORT_OUTSIDE_LIB_REFERENCES_FILE_INSIDE]);
   }
+
   void test_import_referenceIntoLibDirectory_no_pubspec() {
     cacheSource("/myproj/lib/other.dart", "");
     Source source = addSource2("/myproj/web/test.dart", EngineTestCase.createSource(["import '../lib/other.dart';"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_import_referenceOutOfLibDirectory() {
     cacheSource("/myproj/pubspec.yaml", "");
     cacheSource("/myproj/web/other.dart", "");
     Source source = addSource2("/myproj/lib/test.dart", EngineTestCase.createSource(["import '../web/other.dart';"]));
     resolve(source);
     assertErrors(source, [PubSuggestionCode.FILE_IMPORT_INSIDE_LIB_REFERENCES_FILE_OUTSIDE]);
   }
+
   void test_import_referenceOutOfLibDirectory_no_pubspec() {
     cacheSource("/myproj/web/other.dart", "");
     Source source = addSource2("/myproj/lib/test.dart", EngineTestCase.createSource(["import '../web/other.dart';"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_import_valid_inside_lib1() {
     cacheSource("/myproj/pubspec.yaml", "");
     cacheSource("/myproj/lib/other.dart", "");
     Source source = addSource2("/myproj/lib/test.dart", EngineTestCase.createSource(["import 'other.dart';"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_import_valid_inside_lib2() {
     cacheSource("/myproj/pubspec.yaml", "");
     cacheSource("/myproj/lib/bar/other.dart", "");
     Source source = addSource2("/myproj/lib/foo/test.dart", EngineTestCase.createSource(["import '../bar/other.dart';"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_import_valid_outside_lib() {
     cacheSource("/myproj/pubspec.yaml", "");
     cacheSource("/myproj/web/other.dart", "");
     Source source = addSource2("/myproj/lib2/test.dart", EngineTestCase.createSource(["import '../web/other.dart';"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   static dartSuite() {
     _ut.group('PubSuggestionCodeTest', () {
       _ut.test('test_import_package', () {
         final __test = new PubSuggestionCodeTest();
         runJUnitTest(__test, __test.test_import_package);
       });
       _ut.test('test_import_packageWithDotDot', () {
         final __test = new PubSuggestionCodeTest();
         runJUnitTest(__test, __test.test_import_packageWithDotDot);
       });
@@ skipping 25 matching lines @@
         final __test = new PubSuggestionCodeTest();
         runJUnitTest(__test, __test.test_import_valid_inside_lib2);
       });
       _ut.test('test_import_valid_outside_lib', () {
         final __test = new PubSuggestionCodeTest();
         runJUnitTest(__test, __test.test_import_valid_outside_lib);
       });
     });
   }
 }
+
 class StaticWarningCodeTest extends ResolverTestCase {
   void fail_undefinedGetter() {
     Source source = addSource(EngineTestCase.createSource([]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.UNDEFINED_GETTER]);
     verify([source]);
   }
+
   void fail_undefinedIdentifier_commentReference() {
     Source source = addSource(EngineTestCase.createSource(["/** [m] xxx [new B.c] */", "class A {", "}"]));
     resolve(source);
     assertErrors(source, [
         StaticWarningCode.UNDEFINED_IDENTIFIER,
         StaticWarningCode.UNDEFINED_IDENTIFIER]);
   }
+
   void fail_undefinedSetter() {
     Source source = addSource(EngineTestCase.createSource(["class C {}", "f(var p) {", "  C.m = 0;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.UNDEFINED_SETTER]);
     verify([source]);
   }
-  void fail_undefinedStaticMethodOrGetter_getter() {
-    Source source = addSource(EngineTestCase.createSource(["class C {}", "f(var p) {", "  f(C.m);", "}"]));
-    resolve(source);
-    assertErrors(source, [StaticWarningCode.UNDEFINED_STATIC_METHOD_OR_GETTER]);
-    verify([source]);
-  }
-  void fail_undefinedStaticMethodOrGetter_method() {
-    Source source = addSource(EngineTestCase.createSource(["class C {}", "f(var p) {", "  f(C.m());", "}"]));
-    resolve(source);
-    assertErrors(source, [StaticWarningCode.UNDEFINED_STATIC_METHOD_OR_GETTER]);
-    verify([source]);
-  }
+
   void test_ambiguousImport_as() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "import 'lib2.dart';",
         "f(p) {p as N;}"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class N {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "class N {}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.AMBIGUOUS_IMPORT]);
   }
+
   void test_ambiguousImport_extends() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "import 'lib2.dart';",
         "class A extends N {}"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class N {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "class N {}"]));
     resolve(source);
     assertErrors(source, [
         StaticWarningCode.AMBIGUOUS_IMPORT,
         CompileTimeErrorCode.EXTENDS_NON_CLASS]);
   }
+
   void test_ambiguousImport_implements() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "import 'lib2.dart';",
         "class A implements N {}"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class N {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "class N {}"]));
     resolve(source);
     assertErrors(source, [
         StaticWarningCode.AMBIGUOUS_IMPORT,
         CompileTimeErrorCode.IMPLEMENTS_NON_CLASS]);
   }
+
   void test_ambiguousImport_inPart() {
     Source source = addSource(EngineTestCase.createSource([
         "library lib;",
         "import 'lib1.dart';",
         "import 'lib2.dart';",
         "part 'part.dart';"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class N {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "class N {}"]));
     Source partSource = addSource2("/part.dart", EngineTestCase.createSource(["part of lib;", "class A extends N {}"]));
     resolve(source);
     assertErrors(partSource, [
         StaticWarningCode.AMBIGUOUS_IMPORT,
         CompileTimeErrorCode.EXTENDS_NON_CLASS]);
   }
+
   void test_ambiguousImport_instanceCreation() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "import 'lib1.dart';",
         "import 'lib2.dart';",
         "f() {new N();}"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class N {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "class N {}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.AMBIGUOUS_IMPORT]);
   }
+
   void test_ambiguousImport_is() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "import 'lib2.dart';",
         "f(p) {p is N;}"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class N {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "class N {}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.AMBIGUOUS_IMPORT]);
   }
+
   void test_ambiguousImport_qualifier() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "import 'lib2.dart';",
         "g() { N.FOO; }"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class N {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "class N {}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.AMBIGUOUS_IMPORT]);
   }
+
   void test_ambiguousImport_typeAnnotation() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "import 'lib2.dart';",
         "typedef N FT(N p);",
         "N f(N p) {",
         "  N v;",
         "}",
         "class A {",
         "  N m() {}",
         "}",
         "class B<T extends N> {}"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class N {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "class N {}"]));
     resolve(source);
     assertErrors(source, [
         StaticWarningCode.AMBIGUOUS_IMPORT,
         StaticWarningCode.AMBIGUOUS_IMPORT,
         StaticWarningCode.AMBIGUOUS_IMPORT,
         StaticWarningCode.AMBIGUOUS_IMPORT,
         StaticWarningCode.AMBIGUOUS_IMPORT,
         StaticWarningCode.AMBIGUOUS_IMPORT,
         StaticWarningCode.AMBIGUOUS_IMPORT]);
   }
+
   void test_ambiguousImport_typeArgument_annotation() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "import 'lib2.dart';",
         "class A<T> {}",
         "A<N> f() {}"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class N {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "class N {}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.AMBIGUOUS_IMPORT]);
   }
+
   void test_ambiguousImport_typeArgument_instanceCreation() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "import 'lib2.dart';",
         "class A<T> {}",
         "f() {new A<N>();}"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class N {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "class N {}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.AMBIGUOUS_IMPORT]);
   }
+
   void test_ambiguousImport_varRead() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "import 'lib2.dart';",
         "f() { g(v); }",
         "g(p) {}"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "var v;"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "var v;"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.AMBIGUOUS_IMPORT]);
   }
+
   void test_ambiguousImport_varWrite() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib1.dart';",
         "import 'lib2.dart';",
         "f() { v = 0; }"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "var v;"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "var v;"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.AMBIGUOUS_IMPORT]);
   }
+
   void test_argumentTypeNotAssignable_annotation_namedConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A.fromInt(int p);",
         "}",
         "@A.fromInt('0')",
         "main() {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_annotation_unnamedConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A(int p);",
         "}",
         "@A('0')",
         "main() {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_binary() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  operator +(int p) {}",
         "}",
         "f(A a) {",
         "  a + '0';",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_cascadeSEcond() {
     Source source = addSource(EngineTestCase.createSource([
         "// filler filler filler filler filler filler filler filler filler filler",
         "class A {",
         "  B ma() {}",
         "}",
         "class B {",
         "  mb(String p) {}",
         "}",
         "",
         "main() {",
         "  A a = new A();",
         "  a..  ma().mb(0);",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_const() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A(String p);",
         "}",
         "main() {",
         "  const A(42);",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_const_super() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  const A(String p);",
         "}",
         "class B extends A {",
         "  const B() : super(42);",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_functionExpressionInvocation_required() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  (int x) {} ('');", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_index() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  operator [](int index) {}",
         "}",
         "f(A a) {",
         "  a['0'];",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_invocation_callParameter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  call(int p) {}",
         "}",
         "f(A a) {",
         "  a('0');",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_invocation_callVariable() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  call(int p) {}",
         "}",
         "main() {",
         "  A a = new A();",
         "  a('0');",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_invocation_functionParameter() {
     Source source = addSource(EngineTestCase.createSource(["a(b(int p)) {", "  b('0');", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_invocation_functionParameter_generic() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<K, V> {",
         "  m(f(K k), V v) {",
         "    f(v);",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_invocation_functionTypes_optional() {
     Source source = addSource(EngineTestCase.createSource([
         "void acceptFunNumOptBool(void funNumOptBool([bool b])) {}",
         "void funNumBool(bool b) {}",
         "main() {",
         "  acceptFunNumOptBool(funNumBool);",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_invocation_generic() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<T> {",
         "  m(T t) {}",
         "}",
         "f(A<String> a) {",
         "  a.m(1);",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_invocation_named() {
     Source source = addSource(EngineTestCase.createSource(["f({String p}) {}", "main() {", "  f(p: 42);", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_invocation_optional() {
     Source source = addSource(EngineTestCase.createSource(["f([String p]) {}", "main() {", "  f(42);", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_invocation_required() {
     Source source = addSource(EngineTestCase.createSource(["f(String p) {}", "main() {", "  f(42);", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_invocation_typedef_generic() {
     Source source = addSource(EngineTestCase.createSource(["typedef A<T>(T p);", "f(A<int> a) {", "  a('1');", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_invocation_typedef_local() {
     Source source = addSource(EngineTestCase.createSource([
         "typedef A(int p);",
         "A getA() => null;",
         "main() {",
         "  A a = getA();",
         "  a('1');",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_invocation_typedef_parameter() {
     Source source = addSource(EngineTestCase.createSource(["typedef A(int p);", "f(A a) {", "  a('1');", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_new_generic() {
     Source source = addSource(EngineTestCase.createSource([
         "class A<T> {",
         "  A(T p) {}",
         "}",
         "main() {",
         "  new A<String>(42);",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_new_optional() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A([String p]) {}",
         "}",
         "main() {",
         "  new A(42);",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_argumentTypeNotAssignable_new_required() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A(String p) {}",
         "}",
         "main() {",
         "  new A(42);",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_assignmentToConst_instanceVariable() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static const v = 0;",
         "}",
         "f() {",
         "  A.v = 1;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ASSIGNMENT_TO_CONST]);
     verify([source]);
   }
+
   void test_assignmentToConst_localVariable() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  const x = 0;", "  x = 1;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ASSIGNMENT_TO_CONST]);
     verify([source]);
   }
+
   void test_assignmentToFinal_instanceVariable() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final v = 0;",
         "}",
         "f() {",
         "  A a = new A();",
         "  a.v = 1;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ASSIGNMENT_TO_FINAL]);
     verify([source]);
   }
+
   void test_assignmentToFinal_localVariable() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  final x = 0;", "  x = 1;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ASSIGNMENT_TO_FINAL]);
     verify([source]);
   }
+
   void test_assignmentToFinal_prefixMinusMinus() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  final x = 0;", "  --x;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ASSIGNMENT_TO_FINAL]);
     verify([source]);
   }
+
   void test_assignmentToFinal_prefixPlusPlus() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  final x = 0;", "  ++x;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ASSIGNMENT_TO_FINAL]);
     verify([source]);
   }
+
   void test_assignmentToFinal_propertyAccess() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int get x => 0;",
         "}",
         "class B {",
         "  static A a;",
         "}",
         "main() {",
         "  B.a.x = 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ASSIGNMENT_TO_FINAL]);
     verify([source]);
   }
+
   void test_assignmentToFinal_suffixMinusMinus() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  final x = 0;", "  x--;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ASSIGNMENT_TO_FINAL]);
     verify([source]);
   }
+
   void test_assignmentToFinal_suffixPlusPlus() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  final x = 0;", "  x++;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ASSIGNMENT_TO_FINAL]);
     verify([source]);
   }
+
   void test_assignmentToFinal_topLevelVariable() {
     Source source = addSource(EngineTestCase.createSource(["final x = 0;", "f() { x = 1; }"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ASSIGNMENT_TO_FINAL]);
     verify([source]);
   }
+
   void test_assignmentToMethod() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m() {}",
         "}",
         "f(A a) {",
         "  a.m = () {};",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ASSIGNMENT_TO_METHOD]);
     verify([source]);
   }
+
   void test_caseBlockNotTerminated() {
     Source source = addSource(EngineTestCase.createSource([
         "f(int p) {",
         "  switch (p) {",
         "    case 0:",
         "      f(p);",
         "    case 1:",
         "      break;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CASE_BLOCK_NOT_TERMINATED]);
     verify([source]);
   }
+
   void test_castToNonType() {
     Source source = addSource(EngineTestCase.createSource(["var A = 0;", "f(String s) { var x = s as A; }"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CAST_TO_NON_TYPE]);
     verify([source]);
   }
+
   void test_concreteClassWithAbstractMember() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  m();", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONCRETE_CLASS_WITH_ABSTRACT_MEMBER]);
     verify([source]);
   }
+
   void test_conflictingDartImport() {
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib.dart';",
         "import 'dart:async';",
         "Future f = null;",
         "Stream s;"]));
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class Future {}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONFLICTING_DART_IMPORT]);
   }
-  void test_conflictingInstanceGetterAndSuperclassMember_direct_field() {
+
+  void test_conflictingInstanceGetterAndSuperclassMember_declField_direct_setter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
-        "  static int v;",
+        "  static set v(x) {}",
         "}",
         "class B extends A {",
-        "  get v => 0;",
+        "  var v;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONFLICTING_INSTANCE_GETTER_AND_SUPERCLASS_MEMBER]);
     verify([source]);
   }
-  void test_conflictingInstanceGetterAndSuperclassMember_direct_getter() {
+
+  void test_conflictingInstanceGetterAndSuperclassMember_declGetter_direct_getter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static get v => 0;",
         "}",
         "class B extends A {",
         "  get v => 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONFLICTING_INSTANCE_GETTER_AND_SUPERCLASS_MEMBER]);
     verify([source]);
   }
-  void test_conflictingInstanceGetterAndSuperclassMember_direct_method() {
+
+  void test_conflictingInstanceGetterAndSuperclassMember_declGetter_direct_method() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static v() {}",
         "}",
         "class B extends A {",
         "  get v => 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONFLICTING_INSTANCE_GETTER_AND_SUPERCLASS_MEMBER]);
     verify([source]);
   }
-  void test_conflictingInstanceGetterAndSuperclassMember_direct_setter() {
+
+  void test_conflictingInstanceGetterAndSuperclassMember_declGetter_direct_setter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static set v(x) {}",
         "}",
         "class B extends A {",
         "  get v => 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONFLICTING_INSTANCE_GETTER_AND_SUPERCLASS_MEMBER]);
     verify([source]);
   }
-  void test_conflictingInstanceGetterAndSuperclassMember_indirect() {
+
+  void test_conflictingInstanceGetterAndSuperclassMember_declGetter_indirect() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static int v;",
         "}",
         "class B extends A {}",
         "class C extends B {",
         "  get v => 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONFLICTING_INSTANCE_GETTER_AND_SUPERCLASS_MEMBER]);
     verify([source]);
   }
-  void test_conflictingInstanceGetterAndSuperclassMember_mixin() {
+
+  void test_conflictingInstanceGetterAndSuperclassMember_declGetter_mixin() {
     Source source = addSource(EngineTestCase.createSource([
         "class M {",
         "  static int v;",
         "}",
         "class B extends Object with M {",
         "  get v => 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONFLICTING_INSTANCE_GETTER_AND_SUPERCLASS_MEMBER]);
     verify([source]);
   }
+
+  void test_conflictingInstanceGetterAndSuperclassMember_direct_field() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class A {",
+        "  static int v;",
+        "}",
+        "class B extends A {",
+        "  get v => 0;",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [StaticWarningCode.CONFLICTING_INSTANCE_GETTER_AND_SUPERCLASS_MEMBER]);
+    verify([source]);
+  }
+
+  void test_conflictingInstanceMethodSetter_sameClass() {
+    Source source = addSource(EngineTestCase.createSource(["class A {", "  foo() {}", "  set foo(a) {}", "}"]));
+    resolve(source);
+    assertErrors(source, [StaticWarningCode.CONFLICTING_INSTANCE_METHOD_SETTER]);
+    verify([source]);
+  }
+
+  void test_conflictingInstanceMethodSetter_setterInInterface() {
+    Source source = addSource(EngineTestCase.createSource([
+        "abstract class A {",
+        "  set foo(a);",
+        "}",
+        "abstract class B implements A {",
+        "  foo() {}",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [StaticWarningCode.CONFLICTING_INSTANCE_METHOD_SETTER]);
+    verify([source]);
+  }
+
+  void test_conflictingInstanceMethodSetter_setterInSuper() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class A {",
+        "  set foo(a) {}",
+        "}",
+        "class B extends A {",
+        "  foo() {}",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [StaticWarningCode.CONFLICTING_INSTANCE_METHOD_SETTER]);
+    verify([source]);
+  }
+
   void test_conflictingInstanceSetterAndSuperclassMember() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static int v;",
         "}",
         "class B extends A {",
         "  set v(x) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONFLICTING_INSTANCE_SETTER_AND_SUPERCLASS_MEMBER]);
     verify([source]);
   }
+
   void test_conflictingStaticGetterAndInstanceSetter_mixin() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  set x(int p) {}",
         "}",
         "class B extends Object with A {",
         "  static get x => 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONFLICTING_STATIC_GETTER_AND_INSTANCE_SETTER]);
     verify([source]);
   }
+
   void test_conflictingStaticGetterAndInstanceSetter_superClass() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  set x(int p) {}",
         "}",
         "class B extends A {",
         "  static get x => 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONFLICTING_STATIC_GETTER_AND_INSTANCE_SETTER]);
     verify([source]);
   }
+
   void test_conflictingStaticGetterAndInstanceSetter_thisClass() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static get x => 0;",
         "  set x(int p) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONFLICTING_STATIC_GETTER_AND_INSTANCE_SETTER]);
     verify([source]);
   }
+
   void test_conflictingStaticSetterAndInstanceMember_thisClass_getter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  get x => 0;",
         "  static set x(int p) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONFLICTING_STATIC_SETTER_AND_INSTANCE_MEMBER]);
     verify([source]);
   }
+
   void test_conflictingStaticSetterAndInstanceMember_thisClass_method() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  x() {}", "  static set x(int p) {}", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONFLICTING_STATIC_SETTER_AND_INSTANCE_MEMBER]);
     verify([source]);
   }
+
   void test_constWithAbstractClass() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  const A();",
         "}",
         "void f() {",
         "  A a = const A();",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.CONST_WITH_ABSTRACT_CLASS]);
     verify([source]);
   }
+
   void test_equalKeysInMap() {
     Source source = addSource(EngineTestCase.createSource(["var m = {'a' : 0, 'b' : 1, 'a' : 2};"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.EQUAL_KEYS_IN_MAP]);
     verify([source]);
   }
+
   void test_exportDuplicatedLibraryName() {
     Source source = addSource(EngineTestCase.createSource([
         "library test;",
         "export 'lib1.dart';",
         "export 'lib2.dart';"]));
     addSource2("/lib1.dart", "library lib;");
     addSource2("/lib2.dart", "library lib;");
     resolve(source);
     assertErrors(source, [StaticWarningCode.EXPORT_DUPLICATED_LIBRARY_NAME]);
     verify([source]);
   }
+
   void test_extraPositionalArguments() {
     Source source = addSource(EngineTestCase.createSource(["f() {}", "main() {", "  f(0, 1, '2');", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.EXTRA_POSITIONAL_ARGUMENTS]);
     verify([source]);
   }
+
   void test_extraPositionalArguments_functionExpression() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  (int x) {} (0, 1);", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.EXTRA_POSITIONAL_ARGUMENTS]);
     verify([source]);
   }
+
   void test_fieldInitializedInInitializerAndDeclaration_final() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  final int x = 0;",
         "  A() : x = 1 {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.FIELD_INITIALIZED_IN_INITIALIZER_AND_DECLARATION]);
     verify([source]);
   }
+
   void test_fieldInitializerNotAssignable() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x;", "  A() : x = '';", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.FIELD_INITIALIZER_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_fieldInitializingFormalNotAssignable() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x;", "  A(String this.x) {}", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.FIELD_INITIALIZING_FORMAL_NOT_ASSIGNABLE]);
     verify([source]);
   }
 
   /**
    * This test doesn't test the FINAL_INITIALIZED_IN_DECLARATION_AND_CONSTRUCTOR code, but tests the
    * FIELD_INITIALIZED_IN_INITIALIZER_AND_DECLARATION code instead. It is provided here to show
    * coverage over all of the permutations of initializers in constructor declarations.
    *
    * Note: FIELD_INITIALIZED_IN_INITIALIZER_AND_DECLARATION covers a subset of
    * FINAL_INITIALIZED_IN_DECLARATION_AND_CONSTRUCTOR, since it more specific, we use it instead of
    * the broader code
    */
   void test_finalInitializedInDeclarationAndConstructor_initializers() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final x = 0;", "  A() : x = 0 {}", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.FIELD_INITIALIZED_IN_INITIALIZER_AND_DECLARATION]);
     verify([source]);
   }
+
   void test_finalInitializedInDeclarationAndConstructor_initializingFormal() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final x = 0;", "  A(this.x) {}", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.FINAL_INITIALIZED_IN_DECLARATION_AND_CONSTRUCTOR]);
     verify([source]);
   }
+
   void test_finalNotInitialized_inConstructor() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final int x;", "  A() {}", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.FINAL_NOT_INITIALIZED]);
     verify([source]);
   }
+
   void test_finalNotInitialized_instanceField_final() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  final F;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.FINAL_NOT_INITIALIZED]);
     verify([source]);
   }
+
   void test_finalNotInitialized_instanceField_final_static() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  static final F;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.FINAL_NOT_INITIALIZED]);
     verify([source]);
   }
+
   void test_finalNotInitialized_library_final() {
     Source source = addSource(EngineTestCase.createSource(["final F;"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.FINAL_NOT_INITIALIZED]);
     verify([source]);
   }
+
   void test_finalNotInitialized_local_final() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  final int x;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.FINAL_NOT_INITIALIZED]);
     verify([source]);
   }
+
   void test_functionWithoutCall_direct() {
     Source source = addSource(EngineTestCase.createSource(["class A implements Function {", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.FUNCTION_WITHOUT_CALL]);
     verify([source]);
   }
+
   void test_functionWithoutCall_indirect_extends() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A implements Function {",
         "}",
         "class B extends A {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.FUNCTION_WITHOUT_CALL]);
     verify([source]);
   }
+
   void test_functionWithoutCall_indirect_implements() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A implements Function {",
         "}",
         "class B implements A {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.FUNCTION_WITHOUT_CALL]);
     verify([source]);
   }
+
   void test_importDuplicatedLibraryName() {
     Source source = addSource(EngineTestCase.createSource([
         "library test;",
         "import 'lib1.dart';",
         "import 'lib2.dart';"]));
     addSource2("/lib1.dart", "library lib;");
     addSource2("/lib2.dart", "library lib;");
     resolve(source);
     assertErrors(source, [
         StaticWarningCode.IMPORT_DUPLICATED_LIBRARY_NAME,
         HintCode.UNUSED_IMPORT,
         HintCode.UNUSED_IMPORT]);
     verify([source]);
   }
+
   void test_inconsistentMethodInheritanceGetterAndMethod() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  int x();",
         "}",
         "abstract class B {",
         "  int get x;",
         "}",
         "class C implements A, B {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INCONSISTENT_METHOD_INHERITANCE_GETTER_AND_METHOD]);
     verify([source]);
   }
+
   void test_instanceMethodNameCollidesWithSuperclassStatic_field() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static var n;",
         "}",
         "class B extends A {",
         "  void n() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INSTANCE_METHOD_NAME_COLLIDES_WITH_SUPERCLASS_STATIC]);
     verify([source]);
   }
+
   void test_instanceMethodNameCollidesWithSuperclassStatic_field2() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static var n;",
         "}",
         "class B extends A {",
         "}",
         "class C extends B {",
         "  void n() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INSTANCE_METHOD_NAME_COLLIDES_WITH_SUPERCLASS_STATIC]);
     verify([source]);
   }
+
   void test_instanceMethodNameCollidesWithSuperclassStatic_getter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static get n {return 0;}",
         "}",
         "class B extends A {",
         "  void n() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INSTANCE_METHOD_NAME_COLLIDES_WITH_SUPERCLASS_STATIC]);
     verify([source]);
   }
+
   void test_instanceMethodNameCollidesWithSuperclassStatic_getter2() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static get n {return 0;}",
         "}",
         "class B extends A {",
         "}",
         "class C extends B {",
         "  void n() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INSTANCE_METHOD_NAME_COLLIDES_WITH_SUPERCLASS_STATIC]);
     verify([source]);
   }
+
   void test_instanceMethodNameCollidesWithSuperclassStatic_method() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static n () {}",
         "}",
         "class B extends A {",
         "  void n() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INSTANCE_METHOD_NAME_COLLIDES_WITH_SUPERCLASS_STATIC]);
     verify([source]);
   }
+
   void test_instanceMethodNameCollidesWithSuperclassStatic_method2() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static n () {}",
         "}",
         "class B extends A {",
         "}",
         "class C extends B {",
         "  void n() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INSTANCE_METHOD_NAME_COLLIDES_WITH_SUPERCLASS_STATIC]);
     verify([source]);
   }
+
   void test_instanceMethodNameCollidesWithSuperclassStatic_setter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static set n(int x) {}",
         "}",
         "class B extends A {",
         "  void n() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INSTANCE_METHOD_NAME_COLLIDES_WITH_SUPERCLASS_STATIC]);
     verify([source]);
   }
+
   void test_instanceMethodNameCollidesWithSuperclassStatic_setter2() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static set n(int x) {}",
         "}",
         "class B extends A {",
         "}",
         "class C extends B {",
         "  void n() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INSTANCE_METHOD_NAME_COLLIDES_WITH_SUPERCLASS_STATIC]);
     verify([source]);
   }
+
   void test_invalidGetterOverrideReturnType() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int get g { return 0; }",
         "}",
         "class B extends A {",
         "  String get g { return 'a'; }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_GETTER_OVERRIDE_RETURN_TYPE]);
     verify([source]);
   }
+
   void test_invalidGetterOverrideReturnType_implicit() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  String f;",
         "}",
         "class B extends A {",
         "  int f;",
         "}"]));
     resolve(source);
     assertErrors(source, [
         StaticWarningCode.INVALID_GETTER_OVERRIDE_RETURN_TYPE,
         StaticWarningCode.INVALID_SETTER_OVERRIDE_NORMAL_PARAM_TYPE]);
     verify([source]);
   }
+
   void test_invalidMethodOverrideNamedParamType() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m({int a}) {}",
         "}",
         "class B implements A {",
         "  m({String a}) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_METHOD_OVERRIDE_NAMED_PARAM_TYPE]);
     verify([source]);
   }
+
   void test_invalidMethodOverrideNormalParamType() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m(int a) {}",
         "}",
         "class B implements A {",
         "  m(String a) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_METHOD_OVERRIDE_NORMAL_PARAM_TYPE]);
     verify([source]);
   }
+
   void test_invalidMethodOverrideOptionalParamType() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m([int a]) {}",
         "}",
         "class B implements A {",
         "  m([String a]) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_METHOD_OVERRIDE_OPTIONAL_PARAM_TYPE]);
     verify([source]);
   }
+
   void test_invalidMethodOverrideReturnType_interface() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int m() { return 0; }",
         "}",
         "class B implements A {",
         "  String m() { return 'a'; }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_METHOD_OVERRIDE_RETURN_TYPE]);
     verify([source]);
   }
+
   void test_invalidMethodOverrideReturnType_interface2() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  int m();",
         "}",
         "abstract class B implements A {",
         "}",
         "class C implements B {",
         "  String m() { return 'a'; }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_METHOD_OVERRIDE_RETURN_TYPE]);
     verify([source]);
   }
+
   void test_invalidMethodOverrideReturnType_mixin() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int m() { return 0; }",
         "}",
         "class B extends Object with A {",
         "  String m() { return 'a'; }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_METHOD_OVERRIDE_RETURN_TYPE]);
     verify([source]);
   }
+
   void test_invalidMethodOverrideReturnType_superclass() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int m() { return 0; }",
         "}",
         "class B extends A {",
         "  String m() { return 'a'; }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_METHOD_OVERRIDE_RETURN_TYPE]);
     verify([source]);
   }
+
   void test_invalidMethodOverrideReturnType_superclass2() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int m() { return 0; }",
         "}",
         "class B extends A {",
         "}",
         "class C extends B {",
         "  String m() { return 'a'; }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_METHOD_OVERRIDE_RETURN_TYPE]);
     verify([source]);
   }
+
   void test_invalidMethodOverrideReturnType_void() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int m() {}",
         "}",
         "class B extends A {",
         "  void m() {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_METHOD_OVERRIDE_RETURN_TYPE]);
     verify([source]);
   }
+
   void test_invalidOverrideDifferentDefaultValues_named() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m({int p : 0}) {}",
         "}",
         "class B extends A {",
         "  m({int p : 1}) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_OVERRIDE_DIFFERENT_DEFAULT_VALUES_NAMED]);
     verify([source]);
   }
+
   void test_invalidOverrideDifferentDefaultValues_positional() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m([int p = 0]) {}",
         "}",
         "class B extends A {",
         "  m([int p = 1]) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_OVERRIDE_DIFFERENT_DEFAULT_VALUES_POSITIONAL]);
     verify([source]);
   }
+
   void test_invalidOverrideNamed_fewerNamedParameters() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m({a, b}) {}",
         "}",
         "class B extends A {",
         "  m({a}) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_OVERRIDE_NAMED]);
     verify([source]);
   }
+
   void test_invalidOverrideNamed_missingNamedParameter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m({a, b}) {}",
         "}",
         "class B extends A {",
         "  m({a, c}) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_OVERRIDE_NAMED]);
     verify([source]);
   }
+
   void test_invalidOverridePositional_optional() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m([a, b]) {}",
         "}",
         "class B extends A {",
         "  m([a]) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_OVERRIDE_POSITIONAL]);
     verify([source]);
   }
+
   void test_invalidOverridePositional_optionalAndRequired() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m(a, b, [c, d]) {}",
         "}",
         "class B extends A {",
         "  m(a, b, [c]) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_OVERRIDE_POSITIONAL]);
     verify([source]);
   }
+
   void test_invalidOverridePositional_optionalAndRequired2() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m(a, b, [c, d]) {}",
         "}",
         "class B extends A {",
         "  m(a, [c, d]) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_OVERRIDE_POSITIONAL]);
     verify([source]);
   }
+
   void test_invalidOverrideRequired() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  m(a) {}",
         "}",
         "class B extends A {",
         "  m(a, b) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_OVERRIDE_REQUIRED]);
     verify([source]);
   }
+
   void test_invalidSetterOverrideNormalParamType() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void set s(int v) {}",
         "}",
         "class B extends A {",
         "  void set s(String v) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.INVALID_SETTER_OVERRIDE_NORMAL_PARAM_TYPE]);
     verify([source]);
   }
+
   void test_listElementTypeNotAssignable() {
     Source source = addSource(EngineTestCase.createSource(["var v = <String> [42];"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.LIST_ELEMENT_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_mapKeyTypeNotAssignable() {
     Source source = addSource(EngineTestCase.createSource(["var v = <String, int > {1 : 2};"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.MAP_KEY_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_mapValueTypeNotAssignable() {
     Source source = addSource(EngineTestCase.createSource(["var v = <String, String> {'a' : 2};"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.MAP_VALUE_TYPE_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_mismatchedAccessorTypes_class() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int get g { return 0; }",
         "  set g(String v) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.MISMATCHED_GETTER_AND_SETTER_TYPES]);
     verify([source]);
   }
+
   void test_mismatchedAccessorTypes_getterAndSuperSetter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int get g { return 0; }",
         "}",
         "class B extends A {",
         "  set g(String v) {}",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.MISMATCHED_GETTER_AND_SETTER_TYPES_FROM_SUPERTYPE]);
     verify([source]);
   }
+
   void test_mismatchedAccessorTypes_setterAndSuperGetter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  set g(int v) {}",
         "}",
         "class B extends A {",
         "  String get g { return ''; }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.MISMATCHED_GETTER_AND_SETTER_TYPES_FROM_SUPERTYPE]);
     verify([source]);
   }
+
   void test_mismatchedAccessorTypes_topLevel() {
     Source source = addSource(EngineTestCase.createSource(["int get g { return 0; }", "set g(String v) {}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.MISMATCHED_GETTER_AND_SETTER_TYPES]);
     verify([source]);
   }
+
   void test_mixedReturnTypes_localFunction() {
     Source source = addSource(EngineTestCase.createSource([
         "class C {",
         "  m(int x) {",
         "    return (int y) {",
         "      if (y < 0) {",
         "        return;",
         "      }",
         "      return 0;",
         "    };",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.MIXED_RETURN_TYPES]);
     verify([source]);
   }
+
   void test_mixedReturnTypes_method() {
     Source source = addSource(EngineTestCase.createSource([
         "class C {",
         "  m(int x) {",
         "    if (x < 0) {",
         "      return;",
         "    }",
         "    return 0;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.MIXED_RETURN_TYPES]);
     verify([source]);
   }
+
   void test_mixedReturnTypes_topLevelFunction() {
     Source source = addSource(EngineTestCase.createSource([
         "f(int x) {",
         "  if (x < 0) {",
         "    return;",
         "  }",
         "  return 0;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.MIXED_RETURN_TYPES]);
     verify([source]);
   }
+
   void test_newWithAbstractClass() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {}",
         "void f() {",
         "  A a = new A();",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NEW_WITH_ABSTRACT_CLASS]);
     verify([source]);
   }
+
   void test_newWithInvalidTypeParameters() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "f() { return new A<A>(); }"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NEW_WITH_INVALID_TYPE_PARAMETERS]);
     verify([source]);
   }
+
   void test_newWithInvalidTypeParameters_tooFew() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class C<K, V> {}",
         "f(p) {",
         "  return new C<A>();",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NEW_WITH_INVALID_TYPE_PARAMETERS]);
     verify([source]);
   }
+
   void test_newWithInvalidTypeParameters_tooMany() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class C<E> {}",
         "f(p) {",
         "  return new C<A, A>();",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NEW_WITH_INVALID_TYPE_PARAMETERS]);
     verify([source]);
   }
+
   void test_newWithNonType() {
     Source source = addSource(EngineTestCase.createSource(["var A = 0;", "void f() {", "  var a = new A();", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NEW_WITH_NON_TYPE]);
     verify([source]);
   }
+
   void test_newWithNonType_fromLibrary() {
     Source source1 = addSource2("lib.dart", "class B {}");
     Source source2 = addSource2("lib2.dart", EngineTestCase.createSource([
         "import 'lib.dart' as lib;",
         "void f() {",
         "  var a = new lib.A();",
         "}",
         "lib.B b;"]));
     resolve(source1);
     resolve(source2);
     assertErrors(source2, [StaticWarningCode.NEW_WITH_NON_TYPE]);
     verify([source1]);
   }
+
   void test_newWithUndefinedConstructor() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A() {}",
         "}",
         "f() {",
         "  new A.name();",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NEW_WITH_UNDEFINED_CONSTRUCTOR]);
   }
+
   void test_newWithUndefinedConstructorDefault() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A.name() {}",
         "}",
         "f() {",
         "  new A();",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NEW_WITH_UNDEFINED_CONSTRUCTOR_DEFAULT]);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberFivePlus() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  m();",
         "  n();",
         "  o();",
         "  p();",
         "  q();",
         "}",
         "class C extends A {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_FIVE_PLUS]);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberFour() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  m();",
         "  n();",
         "  o();",
         "  p();",
         "}",
         "class C extends A {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_FOUR]);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberOne_getter_fromInterface() {
     Source source = addSource(EngineTestCase.createSource([
         "class I {",
         "  int get g {return 1;}",
         "}",
         "class C implements I {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_ONE]);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberOne_getter_fromSuperclass() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  int get g;",
         "}",
         "class C extends A {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_ONE]);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberOne_method_fromInterface() {
     Source source = addSource(EngineTestCase.createSource([
         "class I {",
         "  m(p) {}",
         "}",
         "class C implements I {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_ONE]);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberOne_method_fromSuperclass() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  m(p);",
         "}",
         "class C extends A {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_ONE]);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberOne_method_optionalParamCount() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  int x(int a);",
         "}",
         "abstract class B {",
         "  int x(int a, [int b]);",
         "}",
         "class C implements A, B {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_ONE]);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberOne_setter_fromInterface() {
     Source source = addSource(EngineTestCase.createSource([
         "class I {",
         "  set s(int i) {}",
         "}",
         "class C implements I {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_ONE]);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberOne_setter_fromSuperclass() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  set s(int i);",
         "}",
         "class C extends A {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_ONE]);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberOne_superclasses_interface() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  get a => 'a';",
         "}",
         "abstract class B implements A {",
         "  get b => 'b';",
         "}",
         "class C extends B {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_ONE]);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberThree() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  m();",
         "  n();",
         "  o();",
         "}",
         "class C extends A {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_THREE]);
     verify([source]);
   }
+
   void test_nonAbstractClassInheritsAbstractMemberTwo() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class A {",
         "  m();",
         "  n();",
         "}",
         "class C extends A {",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_TWO]);
     verify([source]);
   }
+
   void test_nonTypeInCatchClause_noElement() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  try {", "  } on T catch (e) {", "  }", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_TYPE_IN_CATCH_CLAUSE]);
     verify([source]);
   }
+
   void test_nonTypeInCatchClause_notType() {
     Source source = addSource(EngineTestCase.createSource([
         "var T = 0;",
         "f() {",
         "  try {",
         "  } on T catch (e) {",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_TYPE_IN_CATCH_CLAUSE]);
     verify([source]);
   }
+
   void test_nonVoidReturnForOperator() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int operator []=(a, b) {}", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_VOID_RETURN_FOR_OPERATOR]);
     verify([source]);
   }
+
   void test_nonVoidReturnForSetter_function() {
     Source source = addSource(EngineTestCase.createSource(["int set x(int v) {", "  return 42;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_VOID_RETURN_FOR_SETTER]);
     verify([source]);
   }
+
   void test_nonVoidReturnForSetter_method() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int set x(int v) {",
         "    return 42;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NON_VOID_RETURN_FOR_SETTER]);
     verify([source]);
   }
+
   void test_notAType() {
     Source source = addSource(EngineTestCase.createSource(["f() {}", "main() {", "  f v = null;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NOT_A_TYPE]);
     verify([source]);
   }
+
   void test_notEnoughRequiredArguments() {
     Source source = addSource(EngineTestCase.createSource(["f(int a, String b) {}", "main() {", "  f();", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NOT_ENOUGH_REQUIRED_ARGUMENTS]);
     verify([source]);
   }
+
   void test_notEnoughRequiredArguments_functionExpression() {
     Source source = addSource(EngineTestCase.createSource(["main() {", "  (int x) {} ();", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.NOT_ENOUGH_REQUIRED_ARGUMENTS]);
     verify([source]);
   }
+
   void test_partOfDifferentLibrary() {
     Source source = addSource(EngineTestCase.createSource(["library lib;", "part 'part.dart';"]));
     addSource2("/part.dart", EngineTestCase.createSource(["part of lub;"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.PART_OF_DIFFERENT_LIBRARY]);
     verify([source]);
   }
+
   void test_redirectToInvalidFunctionType() {
     Source source = addSource(EngineTestCase.createSource([
         "class A implements B {",
         "  A(int p) {}",
         "}",
         "class B {",
         "  factory B() = A;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.REDIRECT_TO_INVALID_FUNCTION_TYPE]);
     verify([source]);
   }
+
   void test_redirectToInvalidReturnType() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A() {}",
         "}",
         "class B {",
         "  factory B() = A;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.REDIRECT_TO_INVALID_RETURN_TYPE]);
     verify([source]);
   }
+
   void test_redirectToMissingConstructor_named() {
     Source source = addSource(EngineTestCase.createSource([
         "class A implements B{",
         "  A() {}",
         "}",
         "class B {",
         "  factory B() = A.name;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.REDIRECT_TO_MISSING_CONSTRUCTOR]);
   }
+
   void test_redirectToMissingConstructor_unnamed() {
     Source source = addSource(EngineTestCase.createSource([
         "class A implements B{",
         "  A.name() {}",
         "}",
         "class B {",
         "  factory B() = A;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.REDIRECT_TO_MISSING_CONSTRUCTOR]);
   }
+
   void test_redirectToNonClass_notAType() {
     Source source = addSource(EngineTestCase.createSource(["class B {", "  int A;", "  factory B() = A;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.REDIRECT_TO_NON_CLASS]);
     verify([source]);
   }
+
   void test_redirectToNonClass_undefinedIdentifier() {
     Source source = addSource(EngineTestCase.createSource(["class B {", "  factory B() = A;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.REDIRECT_TO_NON_CLASS]);
     verify([source]);
   }
+
   void test_returnWithoutValue() {
     Source source = addSource(EngineTestCase.createSource(["int f() { return; }"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.RETURN_WITHOUT_VALUE]);
     verify([source]);
   }
+
   void test_staticAccessToInstanceMember_method_invocation() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  m() {}", "}", "main() {", "  A.m();", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.STATIC_ACCESS_TO_INSTANCE_MEMBER]);
     verify([source]);
   }
+
   void test_staticAccessToInstanceMember_method_reference() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  m() {}", "}", "main() {", "  A.m;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.STATIC_ACCESS_TO_INSTANCE_MEMBER]);
     verify([source]);
   }
+
   void test_staticAccessToInstanceMember_propertyAccess_field() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  var f;", "}", "main() {", "  A.f;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.STATIC_ACCESS_TO_INSTANCE_MEMBER]);
     verify([source]);
   }
+
   void test_staticAccessToInstanceMember_propertyAccess_getter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  get f => 42;",
         "}",
         "main() {",
         "  A.f;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.STATIC_ACCESS_TO_INSTANCE_MEMBER]);
     verify([source]);
   }
+
   void test_staticAccessToInstanceMember_propertyAccess_setter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  set f(x) {}",
         "}",
         "main() {",
         "  A.f = 42;",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.STATIC_ACCESS_TO_INSTANCE_MEMBER]);
     verify([source]);
   }
+
   void test_switchExpressionNotAssignable() {
     Source source = addSource(EngineTestCase.createSource([
         "f(int p) {",
         "  switch (p) {",
         "    case 'a': break;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.SWITCH_EXPRESSION_NOT_ASSIGNABLE]);
     verify([source]);
   }
+
   void test_typeParameterReferencedByStatic_field() {
     Source source = addSource(EngineTestCase.createSource(["class A<K> {", "  static K k;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.TYPE_PARAMETER_REFERENCED_BY_STATIC]);
     verify([source]);
   }
+
   void test_typeParameterReferencedByStatic_getter() {
     Source source = addSource(EngineTestCase.createSource(["class A<K> {", "  static K get k => 0;", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.TYPE_PARAMETER_REFERENCED_BY_STATIC]);
     verify([source]);
   }
+
   void test_typeParameterReferencedByStatic_methodBodyReference() {
     Source source = addSource(EngineTestCase.createSource(["class A<K> {", "  static m() {", "    K k;", "  }", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.TYPE_PARAMETER_REFERENCED_BY_STATIC]);
     verify([source]);
   }
+
   void test_typeParameterReferencedByStatic_methodParameter() {
     Source source = addSource(EngineTestCase.createSource(["class A<K> {", "  static m(K k) {}", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.TYPE_PARAMETER_REFERENCED_BY_STATIC]);
     verify([source]);
   }
+
   void test_typeParameterReferencedByStatic_methodReturn() {
     Source source = addSource(EngineTestCase.createSource(["class A<K> {", "  static K m() {}", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.TYPE_PARAMETER_REFERENCED_BY_STATIC]);
     verify([source]);
   }
+
   void test_typeParameterReferencedByStatic_setter() {
     Source source = addSource(EngineTestCase.createSource(["class A<K> {", "  static set s(K k) {}", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.TYPE_PARAMETER_REFERENCED_BY_STATIC]);
     verify([source]);
   }
+
   void test_typePromotion_functionType_arg_InterToDyn() {
     Source source = addSource(EngineTestCase.createSource([
         "typedef FuncDyn(x);",
         "typedef FuncA(A a);",
         "class A {}",
         "class B {}",
         "main(FuncA f) {",
         "  if (f is FuncDyn) {",
         "    f(new B());",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]);
   }
+
   void test_typeTestNonType() {
     Source source = addSource(EngineTestCase.createSource(["var A = 0;", "f(var p) {", "  if (p is A) {", "  }", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.TYPE_TEST_NON_TYPE]);
     verify([source]);
   }
+
   void test_undefinedClass_instanceCreation() {
     Source source = addSource(EngineTestCase.createSource(["f() { new C(); }"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.UNDEFINED_CLASS]);
   }
+
   void test_undefinedClass_variableDeclaration() {
     Source source = addSource(EngineTestCase.createSource(["f() { C c; }"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.UNDEFINED_CLASS]);
   }
+
   void test_undefinedClassBoolean_variableDeclaration() {
     Source source = addSource(EngineTestCase.createSource(["f() { boolean v; }"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.UNDEFINED_CLASS_BOOLEAN]);
   }
+
   void test_undefinedGetter_fromLibrary() {
     Source source1 = addSource2("lib.dart", "");
     Source source2 = addSource2("lib2.dart", EngineTestCase.createSource([
         "import 'lib.dart' as lib;",
         "void f() {",
         "  var g = lib.gg;",
         "}"]));
     resolve(source1);
     resolve(source2);
     assertErrors(source2, [StaticWarningCode.UNDEFINED_GETTER]);
     verify([source1]);
   }
+
   void test_undefinedIdentifier_for() {
     Source source = addSource(EngineTestCase.createSource(["f(var l) {", "  for (e in l) {", "  }", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.UNDEFINED_IDENTIFIER]);
   }
+
   void test_undefinedIdentifier_function() {
     Source source = addSource(EngineTestCase.createSource(["int a() => b;"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.UNDEFINED_IDENTIFIER]);
   }
+
   void test_undefinedIdentifier_function_prefix() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class C {}"]));
     Source source = addSource(EngineTestCase.createSource(["import 'lib.dart' as b;", "", "int a() => b;", "b.C c;"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.UNDEFINED_IDENTIFIER]);
     verify([source]);
   }
+
   void test_undefinedIdentifier_initializer() {
     Source source = addSource(EngineTestCase.createSource(["var a = b;"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.UNDEFINED_IDENTIFIER]);
   }
+
   void test_undefinedIdentifier_initializer_prefix() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class C {}"]));
     Source source = addSource(EngineTestCase.createSource(["import 'lib.dart' as b;", "", "var a = b;", "b.C c;"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.UNDEFINED_IDENTIFIER]);
   }
+
   void test_undefinedIdentifier_methodInvocation() {
     Source source = addSource(EngineTestCase.createSource(["f() { C.m(); }"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.UNDEFINED_IDENTIFIER]);
   }
+
   void test_undefinedIdentifier_private_getter() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class A {", "  var _foo;", "}"]));
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib.dart';",
         "class B extends A {",
         "  test() {",
         "    var v = _foo;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.UNDEFINED_IDENTIFIER]);
   }
+
   void test_undefinedIdentifier_private_setter() {
     addSource2("/lib.dart", EngineTestCase.createSource(["library lib;", "class A {", "  var _foo;", "}"]));
     Source source = addSource(EngineTestCase.createSource([
         "import 'lib.dart';",
         "class B extends A {",
         "  test() {",
         "    _foo = 42;",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.UNDEFINED_IDENTIFIER]);
   }
+
   void test_undefinedNamedParameter() {
     Source source = addSource(EngineTestCase.createSource(["f({a, b}) {}", "main() {", "  f(c: 1);", "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.UNDEFINED_NAMED_PARAMETER]);
   }
+
   void test_undefinedSetter() {
     Source source1 = addSource2("lib.dart", "");
     Source source2 = addSource2("lib2.dart", EngineTestCase.createSource([
         "import 'lib.dart' as lib;",
         "void f() {",
         "  lib.gg = null;",
         "}"]));
     resolve(source1);
     resolve(source2);
     assertErrors(source2, [StaticWarningCode.UNDEFINED_SETTER]);
   }
+
+  void test_undefinedStaticMethodOrGetter_getter() {
+    Source source = addSource(EngineTestCase.createSource(["class C {}", "f(var p) {", "  f(C.m);", "}"]));
+    resolve(source);
+    assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
+  }
+
+  void test_undefinedStaticMethodOrGetter_getter_inSuperclass() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class S {",
+        "  static int get g => 0;",
+        "}",
+        "class C extends S {}",
+        "f(var p) {",
+        "  f(C.g);",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [StaticTypeWarningCode.UNDEFINED_GETTER]);
+  }
+
+  void test_undefinedStaticMethodOrGetter_method() {
+    Source source = addSource(EngineTestCase.createSource(["class C {}", "f(var p) {", "  f(C.m());", "}"]));
+    resolve(source);
+    assertErrors(source, [StaticTypeWarningCode.UNDEFINED_METHOD]);
+  }
+
+  void test_undefinedStaticMethodOrGetter_method_inSuperclass() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class S {",
+        "  static m() {}",
+        "}",
+        "class C extends S {}",
+        "f(var p) {",
+        "  f(C.m());",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [StaticTypeWarningCode.UNDEFINED_METHOD]);
+  }
+
+  void test_undefinedStaticMethodOrGetter_setter_inSuperclass() {
+    Source source = addSource(EngineTestCase.createSource([
+        "class S {",
+        "  static set s(int i) {}",
+        "}",
+        "class C extends S {}",
+        "f(var p) {",
+        "  f(C.s = 1);",
+        "}"]));
+    resolve(source);
+    assertErrors(source, [StaticTypeWarningCode.UNDEFINED_SETTER]);
+  }
+
   static dartSuite() {
     _ut.group('StaticWarningCodeTest', () {
       _ut.test('test_ambiguousImport_as', () {
         final __test = new StaticWarningCodeTest();
         runJUnitTest(__test, __test.test_ambiguousImport_as);
       });
       _ut.test('test_ambiguousImport_extends', () {
         final __test = new StaticWarningCodeTest();
         runJUnitTest(__test, __test.test_ambiguousImport_extends);
       });
@@ skipping 182 matching lines @@
         runJUnitTest(__test, __test.test_castToNonType);
       });
       _ut.test('test_concreteClassWithAbstractMember', () {
         final __test = new StaticWarningCodeTest();
         runJUnitTest(__test, __test.test_concreteClassWithAbstractMember);
       });
       _ut.test('test_conflictingDartImport', () {
         final __test = new StaticWarningCodeTest();
         runJUnitTest(__test, __test.test_conflictingDartImport);
       });
+      _ut.test('test_conflictingInstanceGetterAndSuperclassMember_declField_direct_setter', () {
+        final __test = new StaticWarningCodeTest();
+        runJUnitTest(__test, __test.test_conflictingInstanceGetterAndSuperclassMember_declField_direct_setter);
+      });
+      _ut.test('test_conflictingInstanceGetterAndSuperclassMember_declGetter_direct_getter', () {
+        final __test = new StaticWarningCodeTest();
+        runJUnitTest(__test, __test.test_conflictingInstanceGetterAndSuperclassMember_declGetter_direct_getter);
+      });
+      _ut.test('test_conflictingInstanceGetterAndSuperclassMember_declGetter_direct_method', () {
+        final __test = new StaticWarningCodeTest();
+        runJUnitTest(__test, __test.test_conflictingInstanceGetterAndSuperclassMember_declGetter_direct_method);
+      });
+      _ut.test('test_conflictingInstanceGetterAndSuperclassMember_declGetter_direct_setter', () {
+        final __test = new StaticWarningCodeTest();
+        runJUnitTest(__test, __test.test_conflictingInstanceGetterAndSuperclassMember_declGetter_direct_setter);
+      });
+      _ut.test('test_conflictingInstanceGetterAndSuperclassMember_declGetter_indirect', () {
+        final __test = new StaticWarningCodeTest();
+        runJUnitTest(__test, __test.test_conflictingInstanceGetterAndSuperclassMember_declGetter_indirect);
+      });
+      _ut.test('test_conflictingInstanceGetterAndSuperclassMember_declGetter_mixin', () {
+        final __test = new StaticWarningCodeTest();
+        runJUnitTest(__test, __test.test_conflictingInstanceGetterAndSuperclassMember_declGetter_mixin);
+      });
       _ut.test('test_conflictingInstanceGetterAndSuperclassMember_direct_field', () {
         final __test = new StaticWarningCodeTest();
         runJUnitTest(__test, __test.test_conflictingInstanceGetterAndSuperclassMember_direct_field);
       });
-      _ut.test('test_conflictingInstanceGetterAndSuperclassMember_direct_getter', () {
+      _ut.test('test_conflictingInstanceMethodSetter_sameClass', () {
         final __test = new StaticWarningCodeTest();
-        runJUnitTest(__test, __test.test_conflictingInstanceGetterAndSuperclassMember_direct_getter);
+        runJUnitTest(__test, __test.test_conflictingInstanceMethodSetter_sameClass);
       });
-      _ut.test('test_conflictingInstanceGetterAndSuperclassMember_direct_method', () {
+      _ut.test('test_conflictingInstanceMethodSetter_setterInInterface', () {
         final __test = new StaticWarningCodeTest();
-        runJUnitTest(__test, __test.test_conflictingInstanceGetterAndSuperclassMember_direct_method);
+        runJUnitTest(__test, __test.test_conflictingInstanceMethodSetter_setterInInterface);
       });
-      _ut.test('test_conflictingInstanceGetterAndSuperclassMember_direct_setter', () {
+      _ut.test('test_conflictingInstanceMethodSetter_setterInSuper', () {
         final __test = new StaticWarningCodeTest();
-        runJUnitTest(__test, __test.test_conflictingInstanceGetterAndSuperclassMember_direct_setter);
-      });
-      _ut.test('test_conflictingInstanceGetterAndSuperclassMember_indirect', () {
-        final __test = new StaticWarningCodeTest();
-        runJUnitTest(__test, __test.test_conflictingInstanceGetterAndSuperclassMember_indirect);
-      });
-      _ut.test('test_conflictingInstanceGetterAndSuperclassMember_mixin', () {
-        final __test = new StaticWarningCodeTest();
-        runJUnitTest(__test, __test.test_conflictingInstanceGetterAndSuperclassMember_mixin);
+        runJUnitTest(__test, __test.test_conflictingInstanceMethodSetter_setterInSuper);
       });
       _ut.test('test_conflictingInstanceSetterAndSuperclassMember', () {
         final __test = new StaticWarningCodeTest();
         runJUnitTest(__test, __test.test_conflictingInstanceSetterAndSuperclassMember);
       });
       _ut.test('test_conflictingStaticGetterAndInstanceSetter_mixin', () {
         final __test = new StaticWarningCodeTest();
         runJUnitTest(__test, __test.test_conflictingStaticGetterAndInstanceSetter_mixin);
       });
       _ut.test('test_conflictingStaticGetterAndInstanceSetter_superClass', () {
@@ skipping 493 matching lines @@
         runJUnitTest(__test, __test.test_undefinedIdentifier_private_setter);
       });
       _ut.test('test_undefinedNamedParameter', () {
         final __test = new StaticWarningCodeTest();
         runJUnitTest(__test, __test.test_undefinedNamedParameter);
       });
       _ut.test('test_undefinedSetter', () {
         final __test = new StaticWarningCodeTest();
         runJUnitTest(__test, __test.test_undefinedSetter);
       });
+      _ut.test('test_undefinedStaticMethodOrGetter_getter', () {
+        final __test = new StaticWarningCodeTest();
+        runJUnitTest(__test, __test.test_undefinedStaticMethodOrGetter_getter);
+      });
+      _ut.test('test_undefinedStaticMethodOrGetter_getter_inSuperclass', () {
+        final __test = new StaticWarningCodeTest();
+        runJUnitTest(__test, __test.test_undefinedStaticMethodOrGetter_getter_inSuperclass);
+      });
+      _ut.test('test_undefinedStaticMethodOrGetter_method', () {
+        final __test = new StaticWarningCodeTest();
+        runJUnitTest(__test, __test.test_undefinedStaticMethodOrGetter_method);
+      });
+      _ut.test('test_undefinedStaticMethodOrGetter_method_inSuperclass', () {
+        final __test = new StaticWarningCodeTest();
+        runJUnitTest(__test, __test.test_undefinedStaticMethodOrGetter_method_inSuperclass);
+      });
+      _ut.test('test_undefinedStaticMethodOrGetter_setter_inSuperclass', () {
+        final __test = new StaticWarningCodeTest();
+        runJUnitTest(__test, __test.test_undefinedStaticMethodOrGetter_setter_inSuperclass);
+      });
     });
   }
 }
+
 class ErrorResolverTest extends ResolverTestCase {
   void test_breakLabelOnSwitchMember() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void m(int i) {",
         "    switch (i) {",
         "      l: case 0:",
         "        break;",
         "      case 1:",
         "        break l;",
         "    }",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [ResolverErrorCode.BREAK_LABEL_ON_SWITCH_MEMBER]);
     verify([source]);
   }
+
   void test_continueLabelOnSwitch() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void m(int i) {",
         "    l: switch (i) {",
         "      case 0:",
         "        continue l;",
         "    }",
         "  }",
         "}"]));
     resolve(source);
     assertErrors(source, [ResolverErrorCode.CONTINUE_LABEL_ON_SWITCH]);
     verify([source]);
   }
+
   static dartSuite() {
     _ut.group('ErrorResolverTest', () {
       _ut.test('test_breakLabelOnSwitchMember', () {
         final __test = new ErrorResolverTest();
         runJUnitTest(__test, __test.test_breakLabelOnSwitchMember);
       });
       _ut.test('test_continueLabelOnSwitch', () {
         final __test = new ErrorResolverTest();
         runJUnitTest(__test, __test.test_continueLabelOnSwitch);
       });
     });
   }
 }
+
 /**
  * Instances of the class `TestTypeProvider` implement a type provider that can be used by
  * tests without creating the element model for the core library.
  */
 class TestTypeProvider implements TypeProvider {
-
   /**
    * The type representing the built-in type 'bool'.
    */
   InterfaceType _boolType;
 
   /**
    * The type representing the type 'bottom'.
    */
   Type2 _bottomType;
 
   /**
    * The type representing the built-in type 'double'.
    */
   InterfaceType _doubleType;
 
   /**
+   * The type representing the built-in type 'deprecated'.
+   */
+  InterfaceType _deprecatedType;
+
+  /**
    * The type representing the built-in type 'dynamic'.
    */
   Type2 _dynamicType;
 
   /**
    * The type representing the built-in type 'Function'.
    */
   InterfaceType _functionType;
 
   /**
@@ skipping 48 matching lines @@
 
   /**
    * The type representing the built-in type 'Symbol'.
    */
   InterfaceType _symbolType;
 
   /**
    * The type representing the built-in type 'Type'.
    */
   InterfaceType _typeType;
+
   InterfaceType get boolType {
     if (_boolType == null) {
       _boolType = ElementFactory.classElement2("bool", []).type;
     }
     return _boolType;
   }
+
   Type2 get bottomType {
     if (_bottomType == null) {
       _bottomType = BottomTypeImpl.instance;
     }
     return _bottomType;
   }
+
+  InterfaceType get deprecatedType {
+    if (_deprecatedType == null) {
+      ClassElementImpl deprecatedElement = ElementFactory.classElement2("Deprecated", []);
+      deprecatedElement.constructors = <ConstructorElement> [ElementFactory.constructorElement(deprecatedElement, null, true, [stringType])];
+      _deprecatedType = deprecatedElement.type;
+    }
+    return _deprecatedType;
+  }
+
   InterfaceType get doubleType {
     if (_doubleType == null) {
       initializeNumericTypes();
     }
     return _doubleType;
   }
+
   Type2 get dynamicType {
     if (_dynamicType == null) {
       _dynamicType = DynamicTypeImpl.instance;
     }
     return _dynamicType;
   }
+
   InterfaceType get functionType {
     if (_functionType == null) {
       _functionType = ElementFactory.classElement2("Function", []).type;
     }
     return _functionType;
   }
+
   InterfaceType get intType {
     if (_intType == null) {
       initializeNumericTypes();
     }
     return _intType;
   }
+
   InterfaceType get iterableType {
     if (_iterableType == null) {
       ClassElementImpl iterableElement = ElementFactory.classElement2("Iterable", ["E"]);
       _iterableType = iterableElement.type;
       Type2 eType = iterableElement.typeParameters[0].type;
       iterableElement.accessors = <PropertyAccessorElement> [
           ElementFactory.getterElement("iterator", false, iteratorType.substitute4(<Type2> [eType])),
           ElementFactory.getterElement("last", false, eType)];
       propagateTypeArguments(iterableElement);
     }
     return _iterableType;
   }
+
   InterfaceType get iteratorType {
     if (_iteratorType == null) {
       ClassElementImpl iteratorElement = ElementFactory.classElement2("Iterator", ["E"]);
       _iteratorType = iteratorElement.type;
       Type2 eType = iteratorElement.typeParameters[0].type;
       iteratorElement.accessors = <PropertyAccessorElement> [ElementFactory.getterElement("current", false, eType)];
       propagateTypeArguments(iteratorElement);
     }
     return _iteratorType;
   }
+
   InterfaceType get listType {
     if (_listType == null) {
       ClassElementImpl listElement = ElementFactory.classElement2("List", ["E"]);
-      listElement.constructors = <ConstructorElement> [ElementFactory.constructorElement(listElement, null)];
+      listElement.constructors = <ConstructorElement> [ElementFactory.constructorElement2(listElement, null, [])];
       _listType = listElement.type;
       Type2 eType = listElement.typeParameters[0].type;
       InterfaceType iterableType = this.iterableType.substitute4(<Type2> [eType]);
       listElement.interfaces = <InterfaceType> [iterableType];
       listElement.accessors = <PropertyAccessorElement> [ElementFactory.getterElement("length", false, intType)];
       listElement.methods = <MethodElement> [
           ElementFactory.methodElement("[]", eType, [intType]),
           ElementFactory.methodElement("[]=", VoidTypeImpl.instance, [intType, eType]),
           ElementFactory.methodElement("add", VoidTypeImpl.instance, [eType])];
       propagateTypeArguments(listElement);
     }
     return _listType;
   }
+
   InterfaceType get mapType {
     if (_mapType == null) {
       ClassElementImpl mapElement = ElementFactory.classElement2("Map", ["K", "V"]);
       _mapType = mapElement.type;
       mapElement.accessors = <PropertyAccessorElement> [ElementFactory.getterElement("length", false, intType)];
       propagateTypeArguments(mapElement);
     }
     return _mapType;
   }
+
   InterfaceType get nullType {
     if (_nullType == null) {
       _nullType = ElementFactory.classElement2("Null", []).type;
     }
     return _nullType;
   }
+
   InterfaceType get numType {
     if (_numType == null) {
       initializeNumericTypes();
     }
     return _numType;
   }
+
   InterfaceType get objectType {
     if (_objectType == null) {
       ClassElementImpl objectElement = ElementFactory.object;
       _objectType = objectElement.type;
-      objectElement.constructors = <ConstructorElement> [ElementFactory.constructorElement(objectElement, null)];
+      objectElement.constructors = <ConstructorElement> [ElementFactory.constructorElement2(objectElement, null, [])];
       objectElement.methods = <MethodElement> [
           ElementFactory.methodElement("toString", stringType, []),
           ElementFactory.methodElement("==", boolType, [_objectType]),
           ElementFactory.methodElement("noSuchMethod", dynamicType, [dynamicType])];
       objectElement.accessors = <PropertyAccessorElement> [
           ElementFactory.getterElement("hashCode", false, intType),
           ElementFactory.getterElement("runtimeType", false, typeType)];
     }
     return _objectType;
   }
+
   InterfaceType get stackTraceType {
     if (_stackTraceType == null) {
       _stackTraceType = ElementFactory.classElement2("StackTrace", []).type;
     }
     return _stackTraceType;
   }
+
   InterfaceType get stringType {
     if (_stringType == null) {
       _stringType = ElementFactory.classElement2("String", []).type;
       ClassElementImpl stringElement = _stringType.element as ClassElementImpl;
       stringElement.accessors = <PropertyAccessorElement> [
           ElementFactory.getterElement("isEmpty", false, boolType),
           ElementFactory.getterElement("length", false, intType),
           ElementFactory.getterElement("codeUnits", false, listType.substitute4(<Type2> [intType]))];
       stringElement.methods = <MethodElement> [
           ElementFactory.methodElement("+", _stringType, [_stringType]),
           ElementFactory.methodElement("toLowerCase", _stringType, []),
           ElementFactory.methodElement("toUpperCase", _stringType, [])];
     }
     return _stringType;
   }
+
   InterfaceType get symbolType {
     if (_symbolType == null) {
       _symbolType = ElementFactory.classElement2("Symbol", []).type;
     }
     return _symbolType;
   }
+
   InterfaceType get typeType {
     if (_typeType == null) {
       _typeType = ElementFactory.classElement2("Type", []).type;
     }
     return _typeType;
   }
 
   /**
    * Initialize the numeric types. They are created as a group so that we can (a) create the right
    * hierarchy and (b) add members to them.
@@ skipping 93 matching lines @@
     for (MethodElement method in classElement.methods) {
       FunctionTypeImpl functionType = method.type as FunctionTypeImpl;
       functionType.typeArguments = typeArguments;
     }
     for (ConstructorElement constructor in classElement.constructors) {
       FunctionTypeImpl functionType = constructor.type as FunctionTypeImpl;
       functionType.typeArguments = typeArguments;
     }
   }
 }
+
 /**
  * The class `AnalysisContextFactory` defines utility methods used to create analysis contexts
  * for testing purposes.
  */
 class AnalysisContextFactory {
-
   /**
    * Create an analysis context that has a fake core library already resolved.
    *
    * @return the analysis context that was created
    */
   static AnalysisContextImpl contextWithCore() {
     AnalysisContext sdkContext = DirectoryBasedDartSdk.defaultSdk.context;
     SourceFactory sourceFactory = sdkContext.sourceFactory;
     TestTypeProvider provider = new TestTypeProvider();
     CompilationUnitElementImpl coreUnit = new CompilationUnitElementImpl("core.dart");
     Source coreSource = sourceFactory.forUri(DartSdk.DART_CORE);
     sdkContext.setContents(coreSource, "");
     coreUnit.source = coreSource;
     coreUnit.types = <ClassElement> [
         provider.boolType.element,
+        provider.deprecatedType.element,
         provider.doubleType.element,
         provider.functionType.element,
         provider.intType.element,
         provider.listType.element,
         provider.mapType.element,
         provider.nullType.element,
         provider.numType.element,
         provider.objectType.element,
         provider.stackTraceType.element,
         provider.stringType.element,
         provider.symbolType.element,
         provider.typeType.element];
     coreUnit.functions = <FunctionElement> [ElementFactory.functionElement3("identical", provider.boolType.element, <ClassElement> [provider.objectType.element, provider.objectType.element], null)];
+    TopLevelVariableElement proxyTopLevelVariableElt = ElementFactory.topLevelVariableElement3("proxy", true, false, ElementFactory.classElement2("_Proxy", []).type);
+    TopLevelVariableElement deprecatedTopLevelVariableElt = ElementFactory.topLevelVariableElement3("deprecated", true, false, provider.deprecatedType);
+    coreUnit.accessors = <PropertyAccessorElement> [
+        proxyTopLevelVariableElt.getter,
+        proxyTopLevelVariableElt.setter,
+        deprecatedTopLevelVariableElt.getter,
+        deprecatedTopLevelVariableElt.setter];
+    coreUnit.topLevelVariables = <TopLevelVariableElement> [proxyTopLevelVariableElt, deprecatedTopLevelVariableElt];
     LibraryElementImpl coreLibrary = new LibraryElementImpl(sdkContext, ASTFactory.libraryIdentifier2(["dart", "core"]));
     coreLibrary.definingCompilationUnit = coreUnit;
     CompilationUnitElementImpl htmlUnit = new CompilationUnitElementImpl("html_dartium.dart");
     Source htmlSource = sourceFactory.forUri(DartSdk.DART_HTML);
     sdkContext.setContents(htmlSource, "");
     htmlUnit.source = htmlSource;
     ClassElementImpl elementElement = ElementFactory.classElement2("Element", []);
     InterfaceType elementType = elementElement.type;
     ClassElementImpl documentElement = ElementFactory.classElement("Document", elementType, []);
     ClassElementImpl htmlDocumentElement = ElementFactory.classElement("HtmlDocument", documentElement.type, []);
     htmlDocumentElement.methods = <MethodElement> [ElementFactory.methodElement("query", elementType, <Type2> [provider.stringType])];
     htmlUnit.types = <ClassElement> [
         ElementFactory.classElement("AnchorElement", elementType, []),
         ElementFactory.classElement("BodyElement", elementType, []),
         ElementFactory.classElement("ButtonElement", elementType, []),
         ElementFactory.classElement("DivElement", elementType, []),
         documentElement,
         elementElement,
         htmlDocumentElement,
         ElementFactory.classElement("InputElement", elementType, []),
         ElementFactory.classElement("SelectElement", elementType, [])];
     htmlUnit.functions = <FunctionElement> [ElementFactory.functionElement3("query", elementElement, <ClassElement> [provider.stringType.element], ClassElementImpl.EMPTY_ARRAY)];
-    TopLevelVariableElementImpl document = ElementFactory.topLevelVariableElement3("document", true, htmlDocumentElement.type);
+    TopLevelVariableElementImpl document = ElementFactory.topLevelVariableElement3("document", false, true, htmlDocumentElement.type);
     htmlUnit.topLevelVariables = <TopLevelVariableElement> [document];
     htmlUnit.accessors = <PropertyAccessorElement> [document.getter];
     LibraryElementImpl htmlLibrary = new LibraryElementImpl(sdkContext, ASTFactory.libraryIdentifier2(["dart", "dom", "html"]));
     htmlLibrary.definingCompilationUnit = htmlUnit;
     Map<Source, LibraryElement> elementMap = new Map<Source, LibraryElement>();
     elementMap[coreSource] = coreLibrary;
     elementMap[htmlSource] = htmlLibrary;
-    ((sdkContext as AnalysisContextImpl)).recordLibraryElements(elementMap);
+    (sdkContext as AnalysisContextImpl).recordLibraryElements(elementMap);
     AnalysisContextImpl context = new DelegatingAnalysisContextImpl();
     sourceFactory = new SourceFactory.con2([
         new DartUriResolver(sdkContext.sourceFactory.dartSdk),
         new FileUriResolver()]);
     context.sourceFactory = sourceFactory;
     return context;
   }
 }
+
 class LibraryImportScopeTest extends ResolverTestCase {
   void test_conflictingImports() {
     AnalysisContext context = new AnalysisContextImpl();
     String typeNameA = "A";
     String typeNameB = "B";
     String typeNameC = "C";
     ClassElement typeA = ElementFactory.classElement2(typeNameA, []);
     ClassElement typeB1 = ElementFactory.classElement2(typeNameB, []);
     ClassElement typeB2 = ElementFactory.classElement2(typeNameB, []);
     ClassElement typeC = ElementFactory.classElement2(typeNameC, []);
     LibraryElement importedLibrary1 = createTestLibrary2(context, "imported1", []);
-    ((importedLibrary1.definingCompilationUnit as CompilationUnitElementImpl)).types = <ClassElement> [typeA, typeB1];
+    (importedLibrary1.definingCompilationUnit as CompilationUnitElementImpl).types = <ClassElement> [typeA, typeB1];
     ImportElementImpl import1 = ElementFactory.importFor(importedLibrary1, null, []);
     LibraryElement importedLibrary2 = createTestLibrary2(context, "imported2", []);
-    ((importedLibrary2.definingCompilationUnit as CompilationUnitElementImpl)).types = <ClassElement> [typeB2, typeC];
+    (importedLibrary2.definingCompilationUnit as CompilationUnitElementImpl).types = <ClassElement> [typeB2, typeC];
     ImportElementImpl import2 = ElementFactory.importFor(importedLibrary2, null, []);
     LibraryElementImpl importingLibrary = createTestLibrary2(context, "importing", []);
     importingLibrary.imports = <ImportElement> [import1, import2];
     {
       GatheringErrorListener errorListener = new GatheringErrorListener();
       Scope scope = new LibraryImportScope(importingLibrary, errorListener);
       JUnitTestCase.assertEquals(typeA, scope.lookup(ASTFactory.identifier3(typeNameA), importingLibrary));
       errorListener.assertNoErrors();
       JUnitTestCase.assertEquals(typeC, scope.lookup(ASTFactory.identifier3(typeNameC), importingLibrary));
       errorListener.assertNoErrors();
       Element element = scope.lookup(ASTFactory.identifier3(typeNameB), importingLibrary);
       errorListener.assertErrors2([StaticWarningCode.AMBIGUOUS_IMPORT]);
       EngineTestCase.assertInstanceOf(MultiplyDefinedElement, element);
-      List<Element> conflictingElements = ((element as MultiplyDefinedElement)).conflictingElements;
+      List<Element> conflictingElements = (element as MultiplyDefinedElement).conflictingElements;
       EngineTestCase.assertLength(2, conflictingElements);
       if (identical(conflictingElements[0], typeB1)) {
         JUnitTestCase.assertSame(typeB2, conflictingElements[1]);
       } else if (identical(conflictingElements[0], typeB2)) {
         JUnitTestCase.assertSame(typeB1, conflictingElements[1]);
       } else {
         JUnitTestCase.assertSame(typeB1, conflictingElements[0]);
       }
     }
     {
       GatheringErrorListener errorListener = new GatheringErrorListener();
       Scope scope = new LibraryImportScope(importingLibrary, errorListener);
       Identifier identifier = ASTFactory.identifier3(typeNameB);
       ASTFactory.methodDeclaration(null, ASTFactory.typeName3(identifier, []), null, null, ASTFactory.identifier3("foo"), null);
       Element element = scope.lookup(identifier, importingLibrary);
       errorListener.assertErrors2([StaticWarningCode.AMBIGUOUS_IMPORT]);
       EngineTestCase.assertInstanceOf(MultiplyDefinedElement, element);
     }
   }
+
   void test_creation_empty() {
     LibraryElement definingLibrary = createTestLibrary();
     GatheringErrorListener errorListener = new GatheringErrorListener();
     new LibraryImportScope(definingLibrary, errorListener);
   }
+
   void test_creation_nonEmpty() {
     AnalysisContext context = new AnalysisContextImpl();
     String importedTypeName = "A";
     ClassElement importedType = new ClassElementImpl(ASTFactory.identifier3(importedTypeName));
     LibraryElement importedLibrary = createTestLibrary2(context, "imported", []);
-    ((importedLibrary.definingCompilationUnit as CompilationUnitElementImpl)).types = <ClassElement> [importedType];
+    (importedLibrary.definingCompilationUnit as CompilationUnitElementImpl).types = <ClassElement> [importedType];
     LibraryElementImpl definingLibrary = createTestLibrary2(context, "importing", []);
     ImportElementImpl importElement = new ImportElementImpl();
     importElement.importedLibrary = importedLibrary;
     definingLibrary.imports = <ImportElement> [importElement];
     GatheringErrorListener errorListener = new GatheringErrorListener();
     Scope scope = new LibraryImportScope(definingLibrary, errorListener);
     JUnitTestCase.assertEquals(importedType, scope.lookup(ASTFactory.identifier3(importedTypeName), definingLibrary));
   }
+
   void test_getErrorListener() {
     LibraryElement definingLibrary = createTestLibrary();
     GatheringErrorListener errorListener = new GatheringErrorListener();
     LibraryImportScope scope = new LibraryImportScope(definingLibrary, errorListener);
     JUnitTestCase.assertEquals(errorListener, scope.errorListener);
   }
+
   void test_nonConflictingImports_fromSdk() {
     AnalysisContext context = AnalysisContextFactory.contextWithCore();
     String typeName = "List";
     ClassElement type = ElementFactory.classElement2(typeName, []);
     LibraryElement importedLibrary = createTestLibrary2(context, "lib", []);
-    ((importedLibrary.definingCompilationUnit as CompilationUnitElementImpl)).types = <ClassElement> [type];
+    (importedLibrary.definingCompilationUnit as CompilationUnitElementImpl).types = <ClassElement> [type];
     ImportElementImpl importCore = ElementFactory.importFor(context.getLibraryElement(context.sourceFactory.forUri("dart:core")), null, []);
     ImportElementImpl importLib = ElementFactory.importFor(importedLibrary, null, []);
     LibraryElementImpl importingLibrary = createTestLibrary2(context, "importing", []);
     importingLibrary.imports = <ImportElement> [importCore, importLib];
     GatheringErrorListener errorListener = new GatheringErrorListener();
     Scope scope = new LibraryImportScope(importingLibrary, errorListener);
     JUnitTestCase.assertEquals(type, scope.lookup(ASTFactory.identifier3(typeName), importingLibrary));
     errorListener.assertErrors2([StaticWarningCode.CONFLICTING_DART_IMPORT]);
   }
+
   void test_nonConflictingImports_sameElement() {
     AnalysisContext context = new AnalysisContextImpl();
     String typeNameA = "A";
     String typeNameB = "B";
     ClassElement typeA = ElementFactory.classElement2(typeNameA, []);
     ClassElement typeB = ElementFactory.classElement2(typeNameB, []);
     LibraryElement importedLibrary = createTestLibrary2(context, "imported", []);
-    ((importedLibrary.definingCompilationUnit as CompilationUnitElementImpl)).types = <ClassElement> [typeA, typeB];
+    (importedLibrary.definingCompilationUnit as CompilationUnitElementImpl).types = <ClassElement> [typeA, typeB];
     ImportElementImpl import1 = ElementFactory.importFor(importedLibrary, null, []);
     ImportElementImpl import2 = ElementFactory.importFor(importedLibrary, null, []);
     LibraryElementImpl importingLibrary = createTestLibrary2(context, "importing", []);
     importingLibrary.imports = <ImportElement> [import1, import2];
     GatheringErrorListener errorListener = new GatheringErrorListener();
     Scope scope = new LibraryImportScope(importingLibrary, errorListener);
     JUnitTestCase.assertEquals(typeA, scope.lookup(ASTFactory.identifier3(typeNameA), importingLibrary));
     errorListener.assertNoErrors();
     JUnitTestCase.assertEquals(typeB, scope.lookup(ASTFactory.identifier3(typeNameB), importingLibrary));
     errorListener.assertNoErrors();
   }
+
   void test_prefixedAndNonPrefixed() {
     AnalysisContext context = new AnalysisContextImpl();
     String typeName = "C";
     String prefixName = "p";
     ClassElement prefixedType = ElementFactory.classElement2(typeName, []);
     ClassElement nonPrefixedType = ElementFactory.classElement2(typeName, []);
     LibraryElement prefixedLibrary = createTestLibrary2(context, "import.prefixed", []);
-    ((prefixedLibrary.definingCompilationUnit as CompilationUnitElementImpl)).types = <ClassElement> [prefixedType];
+    (prefixedLibrary.definingCompilationUnit as CompilationUnitElementImpl).types = <ClassElement> [prefixedType];
     ImportElementImpl prefixedImport = ElementFactory.importFor(prefixedLibrary, ElementFactory.prefix(prefixName), []);
     LibraryElement nonPrefixedLibrary = createTestLibrary2(context, "import.nonPrefixed", []);
-    ((nonPrefixedLibrary.definingCompilationUnit as CompilationUnitElementImpl)).types = <ClassElement> [nonPrefixedType];
+    (nonPrefixedLibrary.definingCompilationUnit as CompilationUnitElementImpl).types = <ClassElement> [nonPrefixedType];
     ImportElementImpl nonPrefixedImport = ElementFactory.importFor(nonPrefixedLibrary, null, []);
     LibraryElementImpl importingLibrary = createTestLibrary2(context, "importing", []);
     importingLibrary.imports = <ImportElement> [prefixedImport, nonPrefixedImport];
     GatheringErrorListener errorListener = new GatheringErrorListener();
     Scope scope = new LibraryImportScope(importingLibrary, errorListener);
     Element prefixedElement = scope.lookup(ASTFactory.identifier5(prefixName, typeName), importingLibrary);
     errorListener.assertNoErrors();
     JUnitTestCase.assertSame(prefixedType, prefixedElement);
     Element nonPrefixedElement = scope.lookup(ASTFactory.identifier3(typeName), importingLibrary);
     errorListener.assertNoErrors();
     JUnitTestCase.assertSame(nonPrefixedType, nonPrefixedElement);
   }
+
   static dartSuite() {
     _ut.group('LibraryImportScopeTest', () {
       _ut.test('test_conflictingImports', () {
         final __test = new LibraryImportScopeTest();
         runJUnitTest(__test, __test.test_conflictingImports);
       });
       _ut.test('test_creation_empty', () {
         final __test = new LibraryImportScopeTest();
         runJUnitTest(__test, __test.test_creation_empty);
       });
@@ skipping 13 matching lines @@
         final __test = new LibraryImportScopeTest();
         runJUnitTest(__test, __test.test_nonConflictingImports_sameElement);
       });
       _ut.test('test_prefixedAndNonPrefixed', () {
         final __test = new LibraryImportScopeTest();
         runJUnitTest(__test, __test.test_prefixedAndNonPrefixed);
       });
     });
   }
 }
+
+class IncrementalResolverTest extends ResolverTestCase {
+  void test_resolve() {
+    MethodDeclaration method = resolveMethod(EngineTestCase.createSource([
+        "class C {",
+        "  int m(int a) {",
+        "    return a + a;",
+        "  }",
+        "}"]));
+    BlockFunctionBody body = method.body as BlockFunctionBody;
+    ReturnStatement statement = body.block.statements[0] as ReturnStatement;
+    BinaryExpression expression = statement.expression as BinaryExpression;
+    SimpleIdentifier left = expression.leftOperand as SimpleIdentifier;
+    Element leftElement = left.staticElement;
+    SimpleIdentifier right = expression.rightOperand as SimpleIdentifier;
+    Element rightElement = right.staticElement;
+    JUnitTestCase.assertNotNull(leftElement);
+    JUnitTestCase.assertSame(leftElement, rightElement);
+  }
+
+  MethodDeclaration resolveMethod(String content) {
+    Source source = addSource(content);
+    LibraryElement library = resolve(source);
+    CompilationUnit unit = resolveCompilationUnit(source, library);
+    ClassDeclaration classNode = unit.declarations[0] as ClassDeclaration;
+    MethodDeclaration method = classNode.members[0] as MethodDeclaration;
+    method.body.accept(new ResolutionEraser());
+    GatheringErrorListener errorListener = new GatheringErrorListener();
+    IncrementalResolver resolver = new IncrementalResolver(library, source, typeProvider, errorListener);
+    resolver.resolve(method.body);
+    return method;
+  }
+
+  static dartSuite() {
+    _ut.group('IncrementalResolverTest', () {
+      _ut.test('test_resolve', () {
+        final __test = new IncrementalResolverTest();
+        runJUnitTest(__test, __test.test_resolve);
+      });
+    });
+  }
+}
+
 /**
  * Instances of the class `ResolutionVerifier` verify that all of the nodes in an AST
  * structure that should have been resolved were resolved.
  */
 class ResolutionVerifier extends RecursiveASTVisitor<Object> {
-
   /**
    * A set containing nodes that are known to not be resolvable and should therefore not cause the
    * test to fail.
    */
   Set<ASTNode> _knownExceptions;
 
   /**
    * A list containing all of the AST nodes that were not resolved.
    */
   List<ASTNode> _unresolvedNodes = new List<ASTNode>();
@@ skipping 36 matching lines @@
       }
       if (!_wrongTypedNodes.isEmpty) {
         writer.print("Resolved ");
         writer.print(_wrongTypedNodes.length);
         writer.println(" to the wrong type of element:");
         printNodes(writer, _wrongTypedNodes);
       }
       JUnitTestCase.fail(writer.toString());
     }
   }
+
   Object visitBinaryExpression(BinaryExpression node) {
     node.visitChildren(this);
     if (!node.operator.isUserDefinableOperator) {
       return null;
     }
     Type2 operandType = node.leftOperand.staticType;
     if (operandType == null || operandType.isDynamic) {
       return null;
     }
     return checkResolved2(node, node.staticElement, MethodElement);
   }
+
   Object visitCommentReference(CommentReference node) => null;
+
   Object visitCompilationUnit(CompilationUnit node) {
     node.visitChildren(this);
     return checkResolved2(node, node.element, CompilationUnitElement);
   }
+
   Object visitExportDirective(ExportDirective node) => checkResolved2(node, node.element, ExportElement);
+
   Object visitFunctionDeclaration(FunctionDeclaration node) {
     node.visitChildren(this);
     if (node.element is LibraryElement) {
       _wrongTypedNodes.add(node);
     }
     return null;
   }
+
   Object visitFunctionExpressionInvocation(FunctionExpressionInvocation node) {
     node.visitChildren(this);
     return null;
   }
+
   Object visitImportDirective(ImportDirective node) {
     checkResolved2(node, node.element, ImportElement);
     SimpleIdentifier prefix = node.prefix;
     if (prefix == null) {
       return null;
     }
     return checkResolved2(prefix, prefix.staticElement, PrefixElement);
   }
+
   Object visitIndexExpression(IndexExpression node) {
     node.visitChildren(this);
     Type2 targetType = node.realTarget.staticType;
     if (targetType == null || targetType.isDynamic) {
       return null;
     }
     return checkResolved2(node, node.staticElement, MethodElement);
   }
+
   Object visitLibraryDirective(LibraryDirective node) => checkResolved2(node, node.element, LibraryElement);
+
   Object visitNamedExpression(NamedExpression node) => node.expression.accept(this);
+
   Object visitPartDirective(PartDirective node) => checkResolved2(node, node.element, CompilationUnitElement);
+
   Object visitPartOfDirective(PartOfDirective node) => checkResolved2(node, node.element, LibraryElement);
+
   Object visitPostfixExpression(PostfixExpression node) {
     node.visitChildren(this);
     if (!node.operator.isUserDefinableOperator) {
       return null;
     }
     Type2 operandType = node.operand.staticType;
     if (operandType == null || operandType.isDynamic) {
       return null;
     }
     return checkResolved2(node, node.staticElement, MethodElement);
   }
+
   Object visitPrefixedIdentifier(PrefixedIdentifier node) {
     SimpleIdentifier prefix = node.prefix;
     prefix.accept(this);
     Type2 prefixType = prefix.staticType;
     if (prefixType == null || prefixType.isDynamic) {
       return null;
     }
     return checkResolved(node, node.staticElement);
   }
+
   Object visitPrefixExpression(PrefixExpression node) {
     node.visitChildren(this);
     if (!node.operator.isUserDefinableOperator) {
       return null;
     }
     Type2 operandType = node.operand.staticType;
     if (operandType == null || operandType.isDynamic) {
       return null;
     }
     return checkResolved2(node, node.staticElement, MethodElement);
   }
+
   Object visitPropertyAccess(PropertyAccess node) {
     Expression target = node.realTarget;
     target.accept(this);
     Type2 targetType = target.staticType;
     if (targetType == null || targetType.isDynamic) {
       return null;
     }
     return node.propertyName.accept(this);
   }
+
   Object visitSimpleIdentifier(SimpleIdentifier node) {
     if (node.name == "void") {
       return null;
     }
     ASTNode parent = node.parent;
     if (parent is MethodInvocation) {
       MethodInvocation invocation = parent as MethodInvocation;
       if (identical(invocation.methodName, node)) {
         Expression target = invocation.realTarget;
         Type2 targetType = target == null ? null : target.staticType;
         if (targetType == null || targetType.isDynamic) {
           return null;
         }
       }
     }
     return checkResolved(node, node.staticElement);
   }
+
   Object checkResolved(ASTNode node, Element element) => checkResolved2(node, element, null);
+
   Object checkResolved2(ASTNode node, Element element, Type expectedClass) {
     if (element == null) {
       if (_knownExceptions == null || !_knownExceptions.contains(node)) {
         _unresolvedNodes.add(node);
       }
     } else if (expectedClass != null) {
       if (!isInstanceOf(element, expectedClass)) {
         _wrongTypedNodes.add(node);
       }
     }
     return null;
   }
+
   String getFileName(ASTNode node) {
     if (node != null) {
       ASTNode root = node.root;
       if (root is CompilationUnit) {
         CompilationUnit rootCU = root as CompilationUnit;
         if (rootCU.element != null) {
           return rootCU.element.source.fullName;
         } else {
           return "<unknown file- CompilationUnit.getElement() returned null>";
         }
       } else {
         return "<unknown file- CompilationUnit.getRoot() is not a CompilationUnit>";
       }
     }
     return "<unknown file- ASTNode is null>";
   }
+
   void printNodes(PrintStringWriter writer, List<ASTNode> nodes) {
     for (ASTNode identifier in nodes) {
       writer.print("  ");
       writer.print(identifier.toString());
       writer.print(" (");
       writer.print(getFileName(identifier));
       writer.print(" : ");
       writer.print(identifier.offset);
       writer.println(")");
     }
   }
 }
+
 class MemberMapTest extends JUnitTestCase {
-
   /**
    * The null type.
    */
   InterfaceType _nullType;
+
   void setUp() {
     _nullType = new TestTypeProvider().nullType;
   }
+
   void test_MemberMap_copyConstructor() {
     MethodElement m1 = ElementFactory.methodElement("m1", _nullType, []);
     MethodElement m2 = ElementFactory.methodElement("m2", _nullType, []);
     MethodElement m3 = ElementFactory.methodElement("m3", _nullType, []);
     MemberMap map = new MemberMap();
     map.put(m1.name, m1);
     map.put(m2.name, m2);
     map.put(m3.name, m3);
     MemberMap copy = new MemberMap.con2(map);
     JUnitTestCase.assertEquals(map.size, copy.size);
     JUnitTestCase.assertEquals(m1, copy.get(m1.name));
     JUnitTestCase.assertEquals(m2, copy.get(m2.name));
     JUnitTestCase.assertEquals(m3, copy.get(m3.name));
   }
+
   void test_MemberMap_override() {
     MethodElement m1 = ElementFactory.methodElement("m", _nullType, []);
     MethodElement m2 = ElementFactory.methodElement("m", _nullType, []);
     MemberMap map = new MemberMap();
     map.put(m1.name, m1);
     map.put(m2.name, m2);
     JUnitTestCase.assertEquals(1, map.size);
     JUnitTestCase.assertEquals(m2, map.get("m"));
   }
+
   void test_MemberMap_put() {
     MethodElement m1 = ElementFactory.methodElement("m1", _nullType, []);
     MemberMap map = new MemberMap();
     JUnitTestCase.assertEquals(0, map.size);
     map.put(m1.name, m1);
     JUnitTestCase.assertEquals(1, map.size);
     JUnitTestCase.assertEquals(m1, map.get("m1"));
   }
+
   static dartSuite() {
     _ut.group('MemberMapTest', () {
       _ut.test('test_MemberMap_copyConstructor', () {
         final __test = new MemberMapTest();
         runJUnitTest(__test, __test.test_MemberMap_copyConstructor);
       });
       _ut.test('test_MemberMap_override', () {
         final __test = new MemberMapTest();
         runJUnitTest(__test, __test.test_MemberMap_override);
       });
       _ut.test('test_MemberMap_put', () {
         final __test = new MemberMapTest();
         runJUnitTest(__test, __test.test_MemberMap_put);
       });
     });
   }
 }
+
 class LibraryScopeTest extends ResolverTestCase {
   void test_creation_empty() {
     LibraryElement definingLibrary = createTestLibrary();
     GatheringErrorListener errorListener = new GatheringErrorListener();
     new LibraryScope(definingLibrary, errorListener);
   }
+
   void test_creation_nonEmpty() {
     AnalysisContext context = new AnalysisContextImpl();
     String importedTypeName = "A";
     ClassElement importedType = new ClassElementImpl(ASTFactory.identifier3(importedTypeName));
     LibraryElement importedLibrary = createTestLibrary2(context, "imported", []);
-    ((importedLibrary.definingCompilationUnit as CompilationUnitElementImpl)).types = <ClassElement> [importedType];
+    (importedLibrary.definingCompilationUnit as CompilationUnitElementImpl).types = <ClassElement> [importedType];
     LibraryElementImpl definingLibrary = createTestLibrary2(context, "importing", []);
     ImportElementImpl importElement = new ImportElementImpl();
     importElement.importedLibrary = importedLibrary;
     definingLibrary.imports = <ImportElement> [importElement];
     GatheringErrorListener errorListener = new GatheringErrorListener();
     Scope scope = new LibraryScope(definingLibrary, errorListener);
     JUnitTestCase.assertEquals(importedType, scope.lookup(ASTFactory.identifier3(importedTypeName), definingLibrary));
   }
+
   void test_getErrorListener() {
     LibraryElement definingLibrary = createTestLibrary();
     GatheringErrorListener errorListener = new GatheringErrorListener();
     LibraryScope scope = new LibraryScope(definingLibrary, errorListener);
     JUnitTestCase.assertEquals(errorListener, scope.errorListener);
   }
+
   static dartSuite() {
     _ut.group('LibraryScopeTest', () {
       _ut.test('test_creation_empty', () {
         final __test = new LibraryScopeTest();
         runJUnitTest(__test, __test.test_creation_empty);
       });
       _ut.test('test_creation_nonEmpty', () {
         final __test = new LibraryScopeTest();
         runJUnitTest(__test, __test.test_creation_nonEmpty);
       });
       _ut.test('test_getErrorListener', () {
         final __test = new LibraryScopeTest();
         runJUnitTest(__test, __test.test_getErrorListener);
       });
     });
   }
 }
+
 class StaticTypeAnalyzerTest extends EngineTestCase {
-
   /**
    * The error listener to which errors will be reported.
    */
   GatheringErrorListener _listener;
 
   /**
    * The resolver visitor used to create the analyzer.
    */
   ResolverVisitor _visitor;
 
   /**
    * The analyzer being used to analyze the test cases.
    */
   StaticTypeAnalyzer _analyzer;
 
   /**
    * The type provider used to access the types.
    */
   TestTypeProvider _typeProvider;
+
   void fail_visitFunctionExpressionInvocation() {
     JUnitTestCase.fail("Not yet tested");
     _listener.assertNoErrors();
   }
+
   void fail_visitMethodInvocation() {
     JUnitTestCase.fail("Not yet tested");
     _listener.assertNoErrors();
   }
+
   void fail_visitSimpleIdentifier() {
     JUnitTestCase.fail("Not yet tested");
     _listener.assertNoErrors();
   }
+
   void setUp() {
     _listener = new GatheringErrorListener();
     _typeProvider = new TestTypeProvider();
     _analyzer = createAnalyzer();
   }
+
   void test_visitAdjacentStrings() {
     Expression node = ASTFactory.adjacentStrings([resolvedString("a"), resolvedString("b")]);
     JUnitTestCase.assertSame(_typeProvider.stringType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitArgumentDefinitionTest() {
     Expression node = ASTFactory.argumentDefinitionTest("p");
     JUnitTestCase.assertSame(_typeProvider.boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitAsExpression() {
     ClassElement superclass = ElementFactory.classElement2("A", []);
     InterfaceType superclassType = superclass.type;
     ClassElement subclass = ElementFactory.classElement("B", superclassType, []);
     Expression node = ASTFactory.asExpression(ASTFactory.thisExpression(), ASTFactory.typeName(subclass, []));
     JUnitTestCase.assertSame(subclass.type, analyze2(node, superclassType));
     _listener.assertNoErrors();
   }
+
   void test_visitAssignmentExpression_compound() {
     InterfaceType numType = _typeProvider.numType;
     SimpleIdentifier identifier = resolvedVariable(_typeProvider.intType, "i");
     AssignmentExpression node = ASTFactory.assignmentExpression(identifier, TokenType.PLUS_EQ, resolvedInteger(1));
     MethodElement plusMethod = getMethod(numType, "+");
     node.staticElement = plusMethod;
     JUnitTestCase.assertSame(numType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitAssignmentExpression_simple() {
     InterfaceType intType = _typeProvider.intType;
     Expression node = ASTFactory.assignmentExpression(resolvedVariable(intType, "i"), TokenType.EQ, resolvedInteger(0));
     JUnitTestCase.assertSame(intType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitBinaryExpression_equals() {
     Expression node = ASTFactory.binaryExpression(resolvedInteger(2), TokenType.EQ_EQ, resolvedInteger(3));
     JUnitTestCase.assertSame(_typeProvider.boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitBinaryExpression_logicalAnd() {
     Expression node = ASTFactory.binaryExpression(ASTFactory.booleanLiteral(false), TokenType.AMPERSAND_AMPERSAND, ASTFactory.booleanLiteral(true));
     JUnitTestCase.assertSame(_typeProvider.boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitBinaryExpression_logicalOr() {
     Expression node = ASTFactory.binaryExpression(ASTFactory.booleanLiteral(false), TokenType.BAR_BAR, ASTFactory.booleanLiteral(true));
     JUnitTestCase.assertSame(_typeProvider.boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitBinaryExpression_notEquals() {
     Expression node = ASTFactory.binaryExpression(resolvedInteger(2), TokenType.BANG_EQ, resolvedInteger(3));
     JUnitTestCase.assertSame(_typeProvider.boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitBinaryExpression_plusID() {
     BinaryExpression node = ASTFactory.binaryExpression(resolvedInteger(1), TokenType.PLUS, resolvedDouble(2.0));
     node.staticElement = getMethod(_typeProvider.numType, "+");
     JUnitTestCase.assertSame(_typeProvider.doubleType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitBinaryExpression_plusII() {
     BinaryExpression node = ASTFactory.binaryExpression(resolvedInteger(1), TokenType.PLUS, resolvedInteger(2));
     node.staticElement = getMethod(_typeProvider.numType, "+");
     JUnitTestCase.assertSame(_typeProvider.intType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitBinaryExpression_slash() {
     BinaryExpression node = ASTFactory.binaryExpression(resolvedInteger(2), TokenType.SLASH, resolvedInteger(2));
     node.staticElement = getMethod(_typeProvider.numType, "/");
     JUnitTestCase.assertSame(_typeProvider.doubleType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitBinaryExpression_star_notSpecial() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     InterfaceType typeA = classA.type;
     MethodElement operator = ElementFactory.methodElement("*", typeA, [_typeProvider.doubleType]);
     classA.methods = <MethodElement> [operator];
     BinaryExpression node = ASTFactory.binaryExpression(ASTFactory.asExpression(ASTFactory.identifier3("a"), ASTFactory.typeName(classA, [])), TokenType.PLUS, resolvedDouble(2.0));
     node.staticElement = operator;
     JUnitTestCase.assertSame(typeA, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitBinaryExpression_starID() {
     BinaryExpression node = ASTFactory.binaryExpression(resolvedInteger(1), TokenType.PLUS, resolvedDouble(2.0));
     node.staticElement = getMethod(_typeProvider.numType, "*");
     JUnitTestCase.assertSame(_typeProvider.doubleType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitBooleanLiteral_false() {
     Expression node = ASTFactory.booleanLiteral(false);
     JUnitTestCase.assertSame(_typeProvider.boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitBooleanLiteral_true() {
     Expression node = ASTFactory.booleanLiteral(true);
     JUnitTestCase.assertSame(_typeProvider.boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitCascadeExpression() {
     Expression node = ASTFactory.cascadeExpression(resolvedString("a"), [ASTFactory.propertyAccess2(null, "length")]);
     JUnitTestCase.assertSame(_typeProvider.stringType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitConditionalExpression_differentTypes() {
     Expression node = ASTFactory.conditionalExpression(ASTFactory.booleanLiteral(true), resolvedDouble(1.0), resolvedInteger(0));
     JUnitTestCase.assertSame(_typeProvider.numType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitConditionalExpression_sameTypes() {
     Expression node = ASTFactory.conditionalExpression(ASTFactory.booleanLiteral(true), resolvedInteger(1), resolvedInteger(0));
     JUnitTestCase.assertSame(_typeProvider.intType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitDoubleLiteral() {
     Expression node = ASTFactory.doubleLiteral(4.33);
     JUnitTestCase.assertSame(_typeProvider.doubleType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitFunctionExpression_named_block() {
     Type2 dynamicType = _typeProvider.dynamicType;
     FormalParameter p1 = ASTFactory.namedFormalParameter(ASTFactory.simpleFormalParameter3("p1"), resolvedInteger(0));
     setType(p1, dynamicType);
     FormalParameter p2 = ASTFactory.namedFormalParameter(ASTFactory.simpleFormalParameter3("p2"), resolvedInteger(0));
     setType(p2, dynamicType);
     FunctionExpression node = resolvedFunctionExpression(ASTFactory.formalParameterList([p1, p2]), ASTFactory.blockFunctionBody2([]));
     analyze3(p1);
     analyze3(p2);
     Type2 resultType = analyze(node);
     Map<String, Type2> expectedNamedTypes = new Map<String, Type2>();
     expectedNamedTypes["p1"] = dynamicType;
     expectedNamedTypes["p2"] = dynamicType;
     assertFunctionType(dynamicType, null, null, expectedNamedTypes, resultType);
     _listener.assertNoErrors();
   }
+
   void test_visitFunctionExpression_named_expression() {
     Type2 dynamicType = _typeProvider.dynamicType;
     FormalParameter p = ASTFactory.namedFormalParameter(ASTFactory.simpleFormalParameter3("p"), resolvedInteger(0));
     setType(p, dynamicType);
     FunctionExpression node = resolvedFunctionExpression(ASTFactory.formalParameterList([p]), ASTFactory.expressionFunctionBody(resolvedInteger(0)));
     analyze3(p);
     Type2 resultType = analyze(node);
     Map<String, Type2> expectedNamedTypes = new Map<String, Type2>();
     expectedNamedTypes["p"] = dynamicType;
     assertFunctionType(_typeProvider.intType, null, null, expectedNamedTypes, resultType);
     _listener.assertNoErrors();
   }
+
   void test_visitFunctionExpression_normal_block() {
     Type2 dynamicType = _typeProvider.dynamicType;
     FormalParameter p1 = ASTFactory.simpleFormalParameter3("p1");
     setType(p1, dynamicType);
     FormalParameter p2 = ASTFactory.simpleFormalParameter3("p2");
     setType(p2, dynamicType);
     FunctionExpression node = resolvedFunctionExpression(ASTFactory.formalParameterList([p1, p2]), ASTFactory.blockFunctionBody2([]));
     analyze3(p1);
     analyze3(p2);
     Type2 resultType = analyze(node);
     assertFunctionType(dynamicType, <Type2> [dynamicType, dynamicType], null, null, resultType);
     _listener.assertNoErrors();
   }
+
   void test_visitFunctionExpression_normal_expression() {
     Type2 dynamicType = _typeProvider.dynamicType;
     FormalParameter p = ASTFactory.simpleFormalParameter3("p");
     setType(p, dynamicType);
     FunctionExpression node = resolvedFunctionExpression(ASTFactory.formalParameterList([p]), ASTFactory.expressionFunctionBody(resolvedInteger(0)));
     analyze3(p);
     Type2 resultType = analyze(node);
     assertFunctionType(_typeProvider.intType, <Type2> [dynamicType], null, null, resultType);
     _listener.assertNoErrors();
   }
+
   void test_visitFunctionExpression_normalAndNamed_block() {
     Type2 dynamicType = _typeProvider.dynamicType;
     FormalParameter p1 = ASTFactory.simpleFormalParameter3("p1");
     setType(p1, dynamicType);
     FormalParameter p2 = ASTFactory.namedFormalParameter(ASTFactory.simpleFormalParameter3("p2"), resolvedInteger(0));
     setType(p2, dynamicType);
     FunctionExpression node = resolvedFunctionExpression(ASTFactory.formalParameterList([p1, p2]), ASTFactory.blockFunctionBody2([]));
     analyze3(p2);
     Type2 resultType = analyze(node);
     Map<String, Type2> expectedNamedTypes = new Map<String, Type2>();
     expectedNamedTypes["p2"] = dynamicType;
     assertFunctionType(dynamicType, <Type2> [dynamicType], null, expectedNamedTypes, resultType);
     _listener.assertNoErrors();
   }
+
   void test_visitFunctionExpression_normalAndNamed_expression() {
     Type2 dynamicType = _typeProvider.dynamicType;
     FormalParameter p1 = ASTFactory.simpleFormalParameter3("p1");
     setType(p1, dynamicType);
     FormalParameter p2 = ASTFactory.namedFormalParameter(ASTFactory.simpleFormalParameter3("p2"), resolvedInteger(0));
     setType(p2, dynamicType);
     FunctionExpression node = resolvedFunctionExpression(ASTFactory.formalParameterList([p1, p2]), ASTFactory.expressionFunctionBody(resolvedInteger(0)));
     analyze3(p2);
     Type2 resultType = analyze(node);
     Map<String, Type2> expectedNamedTypes = new Map<String, Type2>();
     expectedNamedTypes["p2"] = dynamicType;
     assertFunctionType(_typeProvider.intType, <Type2> [dynamicType], null, expectedNamedTypes, resultType);
     _listener.assertNoErrors();
   }
+
   void test_visitFunctionExpression_normalAndPositional_block() {
     Type2 dynamicType = _typeProvider.dynamicType;
     FormalParameter p1 = ASTFactory.simpleFormalParameter3("p1");
     setType(p1, dynamicType);
     FormalParameter p2 = ASTFactory.positionalFormalParameter(ASTFactory.simpleFormalParameter3("p2"), resolvedInteger(0));
     setType(p2, dynamicType);
     FunctionExpression node = resolvedFunctionExpression(ASTFactory.formalParameterList([p1, p2]), ASTFactory.blockFunctionBody2([]));
     analyze3(p1);
     analyze3(p2);
     Type2 resultType = analyze(node);
     assertFunctionType(dynamicType, <Type2> [dynamicType], <Type2> [dynamicType], null, resultType);
     _listener.assertNoErrors();
   }
+
   void test_visitFunctionExpression_normalAndPositional_expression() {
     Type2 dynamicType = _typeProvider.dynamicType;
     FormalParameter p1 = ASTFactory.simpleFormalParameter3("p1");
     setType(p1, dynamicType);
     FormalParameter p2 = ASTFactory.positionalFormalParameter(ASTFactory.simpleFormalParameter3("p2"), resolvedInteger(0));
     setType(p2, dynamicType);
     FunctionExpression node = resolvedFunctionExpression(ASTFactory.formalParameterList([p1, p2]), ASTFactory.expressionFunctionBody(resolvedInteger(0)));
     analyze3(p1);
     analyze3(p2);
     Type2 resultType = analyze(node);
     assertFunctionType(_typeProvider.intType, <Type2> [dynamicType], <Type2> [dynamicType], null, resultType);
     _listener.assertNoErrors();
   }
+
   void test_visitFunctionExpression_positional_block() {
     Type2 dynamicType = _typeProvider.dynamicType;
     FormalParameter p1 = ASTFactory.positionalFormalParameter(ASTFactory.simpleFormalParameter3("p1"), resolvedInteger(0));
     setType(p1, dynamicType);
     FormalParameter p2 = ASTFactory.positionalFormalParameter(ASTFactory.simpleFormalParameter3("p2"), resolvedInteger(0));
     setType(p2, dynamicType);
     FunctionExpression node = resolvedFunctionExpression(ASTFactory.formalParameterList([p1, p2]), ASTFactory.blockFunctionBody2([]));
     analyze3(p1);
     analyze3(p2);
     Type2 resultType = analyze(node);
     assertFunctionType(dynamicType, null, <Type2> [dynamicType, dynamicType], null, resultType);
     _listener.assertNoErrors();
   }
+
   void test_visitFunctionExpression_positional_expression() {
     Type2 dynamicType = _typeProvider.dynamicType;
     FormalParameter p = ASTFactory.positionalFormalParameter(ASTFactory.simpleFormalParameter3("p"), resolvedInteger(0));
     setType(p, dynamicType);
     FunctionExpression node = resolvedFunctionExpression(ASTFactory.formalParameterList([p]), ASTFactory.expressionFunctionBody(resolvedInteger(0)));
     analyze3(p);
     Type2 resultType = analyze(node);
     assertFunctionType(_typeProvider.intType, null, <Type2> [dynamicType], null, resultType);
     _listener.assertNoErrors();
   }
+
   void test_visitIndexExpression_getter() {
     InterfaceType listType = _typeProvider.listType;
     SimpleIdentifier identifier = resolvedVariable(listType, "a");
     IndexExpression node = ASTFactory.indexExpression(identifier, resolvedInteger(2));
     MethodElement indexMethod = listType.element.methods[0];
     node.staticElement = indexMethod;
     JUnitTestCase.assertSame(listType.typeArguments[0], analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitIndexExpression_setter() {
     InterfaceType listType = _typeProvider.listType;
     SimpleIdentifier identifier = resolvedVariable(listType, "a");
     IndexExpression node = ASTFactory.indexExpression(identifier, resolvedInteger(2));
     MethodElement indexMethod = listType.element.methods[1];
     node.staticElement = indexMethod;
     ASTFactory.assignmentExpression(node, TokenType.EQ, ASTFactory.integer(0));
     JUnitTestCase.assertSame(listType.typeArguments[0], analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitIndexExpression_typeParameters() {
     InterfaceType intType = _typeProvider.intType;
     InterfaceType listType = _typeProvider.listType;
     MethodElement methodElement = getMethod(listType, "[]");
     SimpleIdentifier identifier = ASTFactory.identifier3("list");
     InterfaceType listOfIntType = listType.substitute4(<Type2> [intType]);
     identifier.staticType = listOfIntType;
     IndexExpression indexExpression = ASTFactory.indexExpression(identifier, ASTFactory.integer(0));
     MethodElement indexMethod = MethodMember.from(methodElement, listOfIntType);
     indexExpression.staticElement = indexMethod;
     JUnitTestCase.assertSame(intType, analyze(indexExpression));
     _listener.assertNoErrors();
   }
+
   void test_visitIndexExpression_typeParameters_inSetterContext() {
     InterfaceType intType = _typeProvider.intType;
     InterfaceType listType = _typeProvider.listType;
     MethodElement methodElement = getMethod(listType, "[]=");
     SimpleIdentifier identifier = ASTFactory.identifier3("list");
     InterfaceType listOfIntType = listType.substitute4(<Type2> [intType]);
     identifier.staticType = listOfIntType;
     IndexExpression indexExpression = ASTFactory.indexExpression(identifier, ASTFactory.integer(0));
     MethodElement indexMethod = MethodMember.from(methodElement, listOfIntType);
     indexExpression.staticElement = indexMethod;
     ASTFactory.assignmentExpression(indexExpression, TokenType.EQ, ASTFactory.integer(0));
     JUnitTestCase.assertSame(intType, analyze(indexExpression));
     _listener.assertNoErrors();
   }
+
   void test_visitInstanceCreationExpression_named() {
     ClassElementImpl classElement = ElementFactory.classElement2("C", []);
     String constructorName = "m";
-    ConstructorElementImpl constructor = ElementFactory.constructorElement(classElement, constructorName);
+    ConstructorElementImpl constructor = ElementFactory.constructorElement2(classElement, constructorName, []);
     constructor.returnType = classElement.type;
     FunctionTypeImpl constructorType = new FunctionTypeImpl.con1(constructor);
     constructor.type = constructorType;
     classElement.constructors = <ConstructorElement> [constructor];
     InstanceCreationExpression node = ASTFactory.instanceCreationExpression2(null, ASTFactory.typeName(classElement, []), [ASTFactory.identifier3(constructorName)]);
     node.staticElement = constructor;
     JUnitTestCase.assertSame(classElement.type, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitInstanceCreationExpression_typeParameters() {
     ClassElementImpl elementC = ElementFactory.classElement2("C", ["E"]);
     ClassElementImpl elementI = ElementFactory.classElement2("I", []);
-    ConstructorElementImpl constructor = ElementFactory.constructorElement(elementC, null);
+    ConstructorElementImpl constructor = ElementFactory.constructorElement2(elementC, null, []);
     elementC.constructors = <ConstructorElement> [constructor];
     constructor.returnType = elementC.type;
     FunctionTypeImpl constructorType = new FunctionTypeImpl.con1(constructor);
     constructor.type = constructorType;
     TypeName typeName = ASTFactory.typeName(elementC, [ASTFactory.typeName(elementI, [])]);
     typeName.type = elementC.type.substitute4(<Type2> [elementI.type]);
     InstanceCreationExpression node = ASTFactory.instanceCreationExpression2(null, typeName, []);
     node.staticElement = constructor;
     InterfaceType interfaceType = analyze(node) as InterfaceType;
     List<Type2> typeArgs = interfaceType.typeArguments;
     JUnitTestCase.assertEquals(1, typeArgs.length);
     JUnitTestCase.assertEquals(elementI.type, typeArgs[0]);
     _listener.assertNoErrors();
   }
+
   void test_visitInstanceCreationExpression_unnamed() {
     ClassElementImpl classElement = ElementFactory.classElement2("C", []);
-    ConstructorElementImpl constructor = ElementFactory.constructorElement(classElement, null);
+    ConstructorElementImpl constructor = ElementFactory.constructorElement2(classElement, null, []);
     constructor.returnType = classElement.type;
     FunctionTypeImpl constructorType = new FunctionTypeImpl.con1(constructor);
     constructor.type = constructorType;
     classElement.constructors = <ConstructorElement> [constructor];
     InstanceCreationExpression node = ASTFactory.instanceCreationExpression2(null, ASTFactory.typeName(classElement, []), []);
     node.staticElement = constructor;
     JUnitTestCase.assertSame(classElement.type, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitIntegerLiteral() {
     Expression node = resolvedInteger(42);
     JUnitTestCase.assertSame(_typeProvider.intType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitIsExpression_negated() {
     Expression node = ASTFactory.isExpression(resolvedString("a"), true, ASTFactory.typeName4("String", []));
     JUnitTestCase.assertSame(_typeProvider.boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitIsExpression_notNegated() {
     Expression node = ASTFactory.isExpression(resolvedString("a"), false, ASTFactory.typeName4("String", []));
     JUnitTestCase.assertSame(_typeProvider.boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitListLiteral_empty() {
     Expression node = ASTFactory.listLiteral([]);
     Type2 resultType = analyze(node);
     assertType2(_typeProvider.listType.substitute4(<Type2> [_typeProvider.dynamicType]), resultType);
     _listener.assertNoErrors();
   }
+
   void test_visitListLiteral_nonEmpty() {
     Expression node = ASTFactory.listLiteral([resolvedInteger(0)]);
     Type2 resultType = analyze(node);
     assertType2(_typeProvider.listType.substitute4(<Type2> [_typeProvider.dynamicType]), resultType);
     _listener.assertNoErrors();
   }
+
   void test_visitMapLiteral_empty() {
     Expression node = ASTFactory.mapLiteral2([]);
     Type2 resultType = analyze(node);
     assertType2(_typeProvider.mapType.substitute4(<Type2> [_typeProvider.dynamicType, _typeProvider.dynamicType]), resultType);
     _listener.assertNoErrors();
   }
+
   void test_visitMapLiteral_nonEmpty() {
     Expression node = ASTFactory.mapLiteral2([ASTFactory.mapLiteralEntry("k", resolvedInteger(0))]);
     Type2 resultType = analyze(node);
     assertType2(_typeProvider.mapType.substitute4(<Type2> [_typeProvider.dynamicType, _typeProvider.dynamicType]), resultType);
     _listener.assertNoErrors();
   }
+
   void test_visitMethodInvocation_then() {
     Expression node = ASTFactory.methodInvocation(null, "then", []);
     analyze(node);
     _listener.assertNoErrors();
   }
+
   void test_visitNamedExpression() {
     Expression node = ASTFactory.namedExpression2("n", resolvedString("a"));
     JUnitTestCase.assertSame(_typeProvider.stringType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitNullLiteral() {
     Expression node = ASTFactory.nullLiteral();
     JUnitTestCase.assertSame(_typeProvider.bottomType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitParenthesizedExpression() {
     Expression node = ASTFactory.parenthesizedExpression(resolvedInteger(0));
     JUnitTestCase.assertSame(_typeProvider.intType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitPostfixExpression_minusMinus() {
     PostfixExpression node = ASTFactory.postfixExpression(resolvedInteger(0), TokenType.MINUS_MINUS);
     JUnitTestCase.assertSame(_typeProvider.intType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitPostfixExpression_plusPlus() {
     PostfixExpression node = ASTFactory.postfixExpression(resolvedInteger(0), TokenType.PLUS_PLUS);
     JUnitTestCase.assertSame(_typeProvider.intType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitPrefixedIdentifier_getter() {
     Type2 boolType = _typeProvider.boolType;
     PropertyAccessorElementImpl getter = ElementFactory.getterElement("b", false, boolType);
     PrefixedIdentifier node = ASTFactory.identifier5("a", "b");
     node.identifier.staticElement = getter;
     JUnitTestCase.assertSame(boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitPrefixedIdentifier_setter() {
     Type2 boolType = _typeProvider.boolType;
     FieldElementImpl field = ElementFactory.fieldElement("b", false, false, false, boolType);
     PropertyAccessorElement setter = field.setter;
     PrefixedIdentifier node = ASTFactory.identifier5("a", "b");
     node.identifier.staticElement = setter;
     JUnitTestCase.assertSame(boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitPrefixedIdentifier_variable() {
     VariableElementImpl variable = ElementFactory.localVariableElement2("b");
     variable.type = _typeProvider.boolType;
     PrefixedIdentifier node = ASTFactory.identifier5("a", "b");
     node.identifier.staticElement = variable;
     JUnitTestCase.assertSame(_typeProvider.boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitPrefixExpression_bang() {
     PrefixExpression node = ASTFactory.prefixExpression(TokenType.BANG, resolvedInteger(0));
     JUnitTestCase.assertSame(_typeProvider.boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitPrefixExpression_minus() {
     PrefixExpression node = ASTFactory.prefixExpression(TokenType.MINUS, resolvedInteger(0));
     MethodElement minusMethod = getMethod(_typeProvider.numType, "-");
     node.staticElement = minusMethod;
     JUnitTestCase.assertSame(_typeProvider.numType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitPrefixExpression_minusMinus() {
     PrefixExpression node = ASTFactory.prefixExpression(TokenType.MINUS_MINUS, resolvedInteger(0));
     MethodElement minusMethod = getMethod(_typeProvider.numType, "-");
     node.staticElement = minusMethod;
     JUnitTestCase.assertSame(_typeProvider.intType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitPrefixExpression_not() {
     Expression node = ASTFactory.prefixExpression(TokenType.BANG, ASTFactory.booleanLiteral(true));
     JUnitTestCase.assertSame(_typeProvider.boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitPrefixExpression_plusPlus() {
     PrefixExpression node = ASTFactory.prefixExpression(TokenType.PLUS_PLUS, resolvedInteger(0));
     MethodElement plusMethod = getMethod(_typeProvider.numType, "+");
     node.staticElement = plusMethod;
     JUnitTestCase.assertSame(_typeProvider.intType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitPrefixExpression_tilde() {
     PrefixExpression node = ASTFactory.prefixExpression(TokenType.TILDE, resolvedInteger(0));
     MethodElement tildeMethod = getMethod(_typeProvider.intType, "~");
     node.staticElement = tildeMethod;
     JUnitTestCase.assertSame(_typeProvider.intType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitPropertyAccess_getter() {
     Type2 boolType = _typeProvider.boolType;
     PropertyAccessorElementImpl getter = ElementFactory.getterElement("b", false, boolType);
     PropertyAccess node = ASTFactory.propertyAccess2(ASTFactory.identifier3("a"), "b");
     node.propertyName.staticElement = getter;
     JUnitTestCase.assertSame(boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitPropertyAccess_setter() {
     Type2 boolType = _typeProvider.boolType;
     FieldElementImpl field = ElementFactory.fieldElement("b", false, false, false, boolType);
     PropertyAccessorElement setter = field.setter;
     PropertyAccess node = ASTFactory.propertyAccess2(ASTFactory.identifier3("a"), "b");
     node.propertyName.staticElement = setter;
     JUnitTestCase.assertSame(boolType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitSimpleStringLiteral() {
     Expression node = resolvedString("a");
     JUnitTestCase.assertSame(_typeProvider.stringType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitStringInterpolation() {
     Expression node = ASTFactory.string([
         ASTFactory.interpolationString("a", "a"),
         ASTFactory.interpolationExpression(resolvedString("b")),
         ASTFactory.interpolationString("c", "c")]);
     JUnitTestCase.assertSame(_typeProvider.stringType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitSuperExpression() {
     InterfaceType superType = ElementFactory.classElement2("A", []).type;
     InterfaceType thisType = ElementFactory.classElement("B", superType, []).type;
     Expression node = ASTFactory.superExpression();
     JUnitTestCase.assertSame(thisType, analyze2(node, thisType));
     _listener.assertNoErrors();
   }
+
   void test_visitSymbolLiteral() {
     JUnitTestCase.assertSame(_typeProvider.symbolType, analyze(ASTFactory.symbolLiteral(["a"])));
   }
+
   void test_visitThisExpression() {
     InterfaceType thisType = ElementFactory.classElement("B", ElementFactory.classElement2("A", []).type, []).type;
     Expression node = ASTFactory.thisExpression();
     JUnitTestCase.assertSame(thisType, analyze2(node, thisType));
     _listener.assertNoErrors();
   }
+
   void test_visitThrowExpression_withoutValue() {
     Expression node = ASTFactory.throwExpression();
     JUnitTestCase.assertSame(_typeProvider.bottomType, analyze(node));
     _listener.assertNoErrors();
   }
+
   void test_visitThrowExpression_withValue() {
     Expression node = ASTFactory.throwExpression2(resolvedInteger(0));
     JUnitTestCase.assertSame(_typeProvider.bottomType, analyze(node));
     _listener.assertNoErrors();
   }
 
   /**
    * Return the type associated with the given expression after the static type analyzer has
    * computed a type for it.
    *
@@ skipping 22 matching lines @@
 
   /**
    * Return the type associated with the given parameter after the static type analyzer has computed
    * a type for it.
    *
    * @param node the parameter with which the type is associated
    * @return the type associated with the parameter
    */
   Type2 analyze3(FormalParameter node) {
     node.accept(_analyzer);
-    return ((node.identifier.staticElement as ParameterElement)).type;
+    return (node.identifier.staticElement as ParameterElement).type;
   }
 
   /**
    * Assert that the actual type is a function type with the expected characteristics.
    *
    * @param expectedReturnType the expected return type of the function
    * @param expectedNormalTypes the expected types of the normal parameters
    * @param expectedOptionalTypes the expected types of the optional parameters
    * @param expectedNamedTypes the expected types of the named parameters
    * @param actualType the type being tested
@@ skipping 25 matching lines @@
     if (expectedNamedTypes == null) {
       EngineTestCase.assertSize2(0, namedTypes);
     } else {
       EngineTestCase.assertSize2(expectedNamedTypes.length, namedTypes);
       for (MapEntry<String, Type2> entry in getMapEntrySet(expectedNamedTypes)) {
         JUnitTestCase.assertSame(entry.getValue(), namedTypes[entry.getKey()]);
       }
     }
     JUnitTestCase.assertSame(expectedReturnType, functionType.returnType);
   }
+
   void assertType(InterfaceTypeImpl expectedType, InterfaceTypeImpl actualType) {
     JUnitTestCase.assertEquals(expectedType.displayName, actualType.displayName);
     JUnitTestCase.assertEquals(expectedType.element, actualType.element);
     List<Type2> expectedArguments = expectedType.typeArguments;
     int length = expectedArguments.length;
     List<Type2> actualArguments = actualType.typeArguments;
     EngineTestCase.assertLength(length, actualArguments);
     for (int i = 0; i < length; i++) {
       assertType2(expectedArguments[i], actualArguments[i]);
     }
   }
+
   void assertType2(Type2 expectedType, Type2 actualType) {
     if (expectedType is InterfaceTypeImpl) {
       EngineTestCase.assertInstanceOf(InterfaceTypeImpl, actualType);
       assertType(expectedType as InterfaceTypeImpl, actualType as InterfaceTypeImpl);
     }
   }
 
   /**
    * Create the analyzer used by the tests.
    *
@@ skipping 104 matching lines @@
    * @param parameter the parameter whose type is to be set
    * @param type the new type of the given parameter
    */
   void setType(FormalParameter parameter, Type2 type) {
     SimpleIdentifier identifier = parameter.identifier;
     Element element = identifier.staticElement;
     if (element is! ParameterElement) {
       element = new ParameterElementImpl.con1(identifier);
       identifier.staticElement = element;
     }
-    ((element as ParameterElementImpl)).type = type;
+    (element as ParameterElementImpl).type = type;
   }
+
   static dartSuite() {
     _ut.group('StaticTypeAnalyzerTest', () {
       _ut.test('test_visitAdjacentStrings', () {
         final __test = new StaticTypeAnalyzerTest();
         runJUnitTest(__test, __test.test_visitAdjacentStrings);
       });
       _ut.test('test_visitArgumentDefinitionTest', () {
         final __test = new StaticTypeAnalyzerTest();
         runJUnitTest(__test, __test.test_visitArgumentDefinitionTest);
       });
@@ skipping 257 matching lines @@
         final __test = new StaticTypeAnalyzerTest();
         runJUnitTest(__test, __test.test_visitThrowExpression_withValue);
       });
       _ut.test('test_visitThrowExpression_withoutValue', () {
         final __test = new StaticTypeAnalyzerTest();
         runJUnitTest(__test, __test.test_visitThrowExpression_withoutValue);
       });
     });
   }
 }
+
 class NonHintCodeTest extends ResolverTestCase {
   void test_deadCode_deadBlock_conditionalElse_debugConst() {
     Source source = addSource(EngineTestCase.createSource([
         "const bool DEBUG = true;",
         "f() {",
         "  DEBUG ? 1 : 2;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_conditionalIf_debugConst() {
     Source source = addSource(EngineTestCase.createSource([
         "const bool DEBUG = false;",
         "f() {",
         "  DEBUG ? 1 : 2;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_else() {
     Source source = addSource(EngineTestCase.createSource([
         "const bool DEBUG = true;",
         "f() {",
         "  if(DEBUG) {} else {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_if_debugConst_prefixedIdentifier() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static const bool DEBUG = false;",
         "}",
         "f() {",
         "  if(A.DEBUG) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_if_debugConst_prefixedIdentifier2() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "import 'lib2.dart';",
         "f() {",
         "  if(A.DEBUG) {}",
         "}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource([
         "library lib2;",
         "class A {",
         "  static const bool DEBUG = false;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_if_debugConst_propertyAccessor() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "import 'lib2.dart' as LIB;",
         "f() {",
         "  if(LIB.A.DEBUG) {}",
         "}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource([
         "library lib2;",
         "class A {",
         "  static const bool DEBUG = false;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_if_debugConst_simpleIdentifier() {
     Source source = addSource(EngineTestCase.createSource([
         "const bool DEBUG = false;",
         "f() {",
         "  if(DEBUG) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_deadCode_deadBlock_while_debugConst() {
     Source source = addSource(EngineTestCase.createSource([
         "const bool DEBUG = false;",
         "f() {",
         "  while(DEBUG) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_deadCode_deadCatch_onCatchSubtype() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {}",
         "f() {",
         "  try {} on B catch (e) {} on A catch (e) {} catch (e) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_deadCode_deadOperandLHS_and_debugConst() {
     Source source = addSource(EngineTestCase.createSource([
         "const bool DEBUG = false;",
         "f() {",
         "  bool b = DEBUG && false;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_deadCode_deadOperandLHS_or_debugConst() {
     Source source = addSource(EngineTestCase.createSource([
         "const bool DEBUG = true;",
         "f() {",
         "  bool b = DEBUG || true;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_divisionOptimization() {
     Source source = addSource(EngineTestCase.createSource(["f(int x, int y) {", "  var v = x / y.toInt();", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_divisionOptimization_supressIfDivisionNotDefinedInCore() {
     Source source = addSource(EngineTestCase.createSource(["f(x, y) {", "  var v = (x / y).toInt();", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_divisionOptimization_supressIfDivisionOverridden() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  num operator /(x) {}",
         "}",
         "f(A x, A y) {",
         "  var v = (x / y).toInt();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_duplicateImport_as() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "import 'lib1.dart';",
         "import 'lib1.dart' as one;",
         "A a;",
         "one.A a2;"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class A {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_duplicateImport_hide() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "import 'lib1.dart';",
         "import 'lib1.dart' hide A;",
         "A a;",
         "B b;"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class A {}", "class B {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_duplicateImport_show() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "import 'lib1.dart';",
         "import 'lib1.dart' show A;",
         "A a;",
         "B b;"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class A {}", "class B {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_overriddingPrivateMember_sameLibrary() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  _m(int x) => 0;",
         "}",
         "class B extends A {",
         "  _m(int x) => 0;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_overrideEqualsButNotHashCode() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  bool operator ==(x) {}",
         "  get hashCode => 0;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_proxy_annotation_prefixed() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
-        "import 'meta.dart';",
         "@proxy",
         "class A {}",
         "f(var a) {",
         "  a = new A();",
         "  a.m();",
         "  var x = a.g;",
         "  a.s = 1;",
         "  var y = a + a;",
         "  a++;",
         "  ++a;",
         "}"]));
-    addSource2("/meta.dart", EngineTestCase.createSource([
-        "library meta;",
-        "const proxy = const _Proxy();",
-        "class _Proxy { const _Proxy(); }"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_proxy_annotation_prefixed2() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
-        "import 'meta.dart';",
         "@proxy",
         "class A {}",
         "class B {",
         "  f(var a) {",
         "    a = new A();",
         "    a.m();",
         "    var x = a.g;",
         "    a.s = 1;",
         "    var y = a + a;",
         "    a++;",
         "    ++a;",
         "  }",
         "}"]));
-    addSource2("/meta.dart", EngineTestCase.createSource([
-        "library meta;",
-        "const proxy = const _Proxy();",
-        "class _Proxy { const _Proxy(); }"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_proxy_annotation_prefixed3() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
-        "import 'meta.dart';",
         "class B {",
         "  f(var a) {",
         "    a = new A();",
         "    a.m();",
         "    var x = a.g;",
         "    a.s = 1;",
         "    var y = a + a;",
         "    a++;",
         "    ++a;",
         "  }",
         "}",
         "@proxy",
         "class A {}"]));
-    addSource2("/meta.dart", EngineTestCase.createSource([
-        "library meta;",
-        "const proxy = const _Proxy();",
-        "class _Proxy { const _Proxy(); }"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_undefinedGetter_inSubtype() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  get b => 0;",
         "}",
         "f(var a) {",
         "  if(a is A) {",
         "    return a.b;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_undefinedMethod_assignmentExpression_inSubtype() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  operator +(B b) {return new B();}",
         "}",
         "f(var a, var a2) {",
         "  a = new A();",
         "  a2 = new A();",
         "  a += a2;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_undefinedMethod_inSubtype() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  b() {}",
         "}",
         "f() {",
         "  var a = new A();",
         "  a.b();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_undefinedOperator_binaryExpression_inSubtype() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  operator +(B b) {}",
         "}",
         "f(var a) {",
         "  if(a is A) {",
         "    a + 1;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_undefinedOperator_indexBoth_inSubtype() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  operator [](int index) {}",
         "}",
         "f(var a) {",
         "  if(a is A) {",
         "    a[0]++;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_undefinedOperator_indexGetter_inSubtype() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  operator [](int index) {}",
         "}",
         "f(var a) {",
         "  if(a is A) {",
         "    a[0];",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_undefinedOperator_indexSetter_inSubtype() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  operator []=(i, v) {}",
         "}",
         "f(var a) {",
         "  if(a is A) {",
         "    a[0] = 1;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_undefinedOperator_postfixExpression() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  operator +(B b) {return new B();}",
         "}",
         "f(var a) {",
         "  if(a is A) {",
         "    a++;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_undefinedOperator_prefixExpression() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  operator +(B b) {return new B();}",
         "}",
         "f(var a) {",
         "  if(a is A) {",
         "    ++a;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_undefinedSetter_inSubtype() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {}",
         "class B extends A {",
         "  set b(x) {}",
         "}",
         "f(var a) {",
         "  if(a is A) {",
         "    a.b = 0;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_unnecessaryCast_13855_parameter_A() {
     Source source = addSource(EngineTestCase.createSource([
         "class A{",
         "  a() {}",
         "}",
         "class B<E> {",
         "  E e;",
         "  m() {",
         "    (e as A).a();",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_unnecessaryCast_dynamic_type() {
     Source source = addSource(EngineTestCase.createSource(["m(v) {", "  var b = v as Object;", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_unnecessaryCast_type_dynamic() {
     Source source = addSource(EngineTestCase.createSource(["m(v) {", "  var b = Object as dynamic;", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_unusedImport_annotationOnDirective() {
     Source source = addSource(EngineTestCase.createSource(["library L;", "@A()", "import 'lib1.dart';"]));
     Source source2 = addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class A {", "  const A() {}", "}"]));
     resolve(source);
     assertErrors(source, []);
     verify([source, source2]);
   }
+
   void test_unusedImport_core_library() {
     Source source = addSource(EngineTestCase.createSource(["library L;", "import 'dart:core';"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_unusedImport_export() {
     Source source = addSource(EngineTestCase.createSource(["library L;", "import 'lib1.dart';", "Two two;"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "export 'lib2.dart';", "class One {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "class Two {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_unusedImport_export_infiniteLoop() {
     Source source = addSource(EngineTestCase.createSource(["library L;", "import 'lib1.dart';", "Two two;"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "export 'lib2.dart';", "class One {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "export 'lib3.dart';", "class Two {}"]));
     addSource2("/lib3.dart", EngineTestCase.createSource(["library lib3;", "export 'lib2.dart';", "class Three {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_unusedImport_export2() {
     Source source = addSource(EngineTestCase.createSource(["library L;", "import 'lib1.dart';", "Three three;"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "export 'lib2.dart';", "class One {}"]));
     addSource2("/lib2.dart", EngineTestCase.createSource(["library lib2;", "export 'lib3.dart';", "class Two {}"]));
     addSource2("/lib3.dart", EngineTestCase.createSource(["library lib3;", "class Three {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_unusedImport_prefix_topLevelFunction() {
     Source source = addSource(EngineTestCase.createSource([
         "library L;",
         "import 'lib1.dart' hide topLevelFunction;",
         "import 'lib1.dart' as one show topLevelFunction;",
         "class A {",
         "  static void x() {",
         "    One o;",
         "    one.topLevelFunction();",
         "  }",
         "}"]));
     addSource2("/lib1.dart", EngineTestCase.createSource(["library lib1;", "class One {}", "topLevelFunction() {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   static dartSuite() {
     _ut.group('NonHintCodeTest', () {
       _ut.test('test_deadCode_deadBlock_conditionalElse_debugConst', () {
         final __test = new NonHintCodeTest();
         runJUnitTest(__test, __test.test_deadCode_deadBlock_conditionalElse_debugConst);
       });
       _ut.test('test_deadCode_deadBlock_conditionalIf_debugConst', () {
         final __test = new NonHintCodeTest();
         runJUnitTest(__test, __test.test_deadCode_deadBlock_conditionalIf_debugConst);
       });
@@ skipping 149 matching lines @@
         final __test = new NonHintCodeTest();
         runJUnitTest(__test, __test.test_unusedImport_export_infiniteLoop);
       });
       _ut.test('test_unusedImport_prefix_topLevelFunction', () {
         final __test = new NonHintCodeTest();
         runJUnitTest(__test, __test.test_unusedImport_prefix_topLevelFunction);
       });
     });
   }
 }
+
 class EnclosedScopeTest extends ResolverTestCase {
   void test_define_duplicate() {
     GatheringErrorListener errorListener2 = new GatheringErrorListener();
-    Scope rootScope = new Scope_21(errorListener2);
+    Scope rootScope = new Scope_22(errorListener2);
     EnclosedScope scope = new EnclosedScope(rootScope);
     VariableElement element1 = ElementFactory.localVariableElement(ASTFactory.identifier3("v1"));
     VariableElement element2 = ElementFactory.localVariableElement(ASTFactory.identifier3("v1"));
     scope.define(element1);
     scope.define(element2);
     errorListener2.assertErrors3([ErrorSeverity.ERROR]);
   }
+
   void test_define_normal() {
     GatheringErrorListener errorListener3 = new GatheringErrorListener();
-    Scope rootScope = new Scope_22(errorListener3);
+    Scope rootScope = new Scope_23(errorListener3);
     EnclosedScope outerScope = new EnclosedScope(rootScope);
     EnclosedScope innerScope = new EnclosedScope(outerScope);
     VariableElement element1 = ElementFactory.localVariableElement(ASTFactory.identifier3("v1"));
     VariableElement element2 = ElementFactory.localVariableElement(ASTFactory.identifier3("v2"));
     outerScope.define(element1);
     innerScope.define(element2);
     errorListener3.assertNoErrors();
   }
+
   static dartSuite() {
     _ut.group('EnclosedScopeTest', () {
       _ut.test('test_define_duplicate', () {
         final __test = new EnclosedScopeTest();
         runJUnitTest(__test, __test.test_define_duplicate);
       });
       _ut.test('test_define_normal', () {
         final __test = new EnclosedScopeTest();
         runJUnitTest(__test, __test.test_define_normal);
       });
     });
   }
 }
-class Scope_21 extends Scope {
+
+class Scope_22 extends Scope {
   GatheringErrorListener errorListener2;
-  Scope_21(this.errorListener2) : super();
+
+  Scope_22(this.errorListener2) : super();
+
   AnalysisErrorListener get errorListener => errorListener2;
+
   Element lookup3(Identifier identifier, String name, LibraryElement referencingLibrary) => null;
 }
-class Scope_22 extends Scope {
+
+class Scope_23 extends Scope {
   GatheringErrorListener errorListener3;
-  Scope_22(this.errorListener3) : super();
+
+  Scope_23(this.errorListener3) : super();
+
   AnalysisErrorListener get errorListener => errorListener3;
+
   Element lookup3(Identifier identifier, String name, LibraryElement referencingLibrary) => null;
 }
+
 class LibraryElementBuilderTest extends EngineTestCase {
-
   /**
    * The source factory used to create [Source].
    */
   SourceFactory _sourceFactory;
+
   void setUp() {
     _sourceFactory = new SourceFactory.con2([new FileUriResolver()]);
   }
+
   void test_accessorsAcrossFiles() {
     Source librarySource = addSource("/lib.dart", EngineTestCase.createSource([
         "library lib;",
         "part 'first.dart';",
         "part 'second.dart';"]));
     addSource("/first.dart", EngineTestCase.createSource(["part of lib;", "int get V => 0;"]));
     addSource("/second.dart", EngineTestCase.createSource(["part of lib;", "void set V(int v) {}"]));
     LibraryElement element = buildLibrary(librarySource, []);
     JUnitTestCase.assertNotNull(element);
     List<CompilationUnitElement> sourcedUnits = element.parts;
     EngineTestCase.assertLength(2, sourcedUnits);
     List<PropertyAccessorElement> firstAccessors = sourcedUnits[0].accessors;
     EngineTestCase.assertLength(1, firstAccessors);
     List<PropertyAccessorElement> secondAccessors = sourcedUnits[1].accessors;
     EngineTestCase.assertLength(1, secondAccessors);
     JUnitTestCase.assertSame(firstAccessors[0].variable, secondAccessors[0].variable);
   }
+
   void test_empty() {
     Source librarySource = addSource("/lib.dart", "library lib;");
     LibraryElement element = buildLibrary(librarySource, []);
     JUnitTestCase.assertNotNull(element);
     JUnitTestCase.assertEquals("lib", element.name);
     JUnitTestCase.assertNull(element.entryPoint);
     EngineTestCase.assertLength(0, element.importedLibraries);
     EngineTestCase.assertLength(0, element.imports);
     JUnitTestCase.assertSame(element, element.library);
     EngineTestCase.assertLength(0, element.prefixes);
     EngineTestCase.assertLength(0, element.parts);
     CompilationUnitElement unit = element.definingCompilationUnit;
     JUnitTestCase.assertNotNull(unit);
     JUnitTestCase.assertEquals("lib.dart", unit.name);
     JUnitTestCase.assertEquals(element, unit.library);
     EngineTestCase.assertLength(0, unit.accessors);
     EngineTestCase.assertLength(0, unit.functions);
     EngineTestCase.assertLength(0, unit.functionTypeAliases);
     EngineTestCase.assertLength(0, unit.types);
     EngineTestCase.assertLength(0, unit.topLevelVariables);
   }
+
   void test_invalidUri_part() {
     Source librarySource = addSource("/lib.dart", EngineTestCase.createSource(["library lib;", "", "part '\${'a'}.dart';"]));
     LibraryElement element = buildLibrary(librarySource, [CompileTimeErrorCode.URI_WITH_INTERPOLATION]);
     JUnitTestCase.assertNotNull(element);
   }
+
   void test_missingLibraryDirectiveWithPart() {
     addSource("/a.dart", EngineTestCase.createSource(["part of lib;"]));
     Source librarySource = addSource("/lib.dart", EngineTestCase.createSource(["part 'a.dart';"]));
     LibraryElement element = buildLibrary(librarySource, [ResolverErrorCode.MISSING_LIBRARY_DIRECTIVE_WITH_PART]);
     JUnitTestCase.assertNotNull(element);
   }
+
   void test_missingPartOfDirective() {
     addSource("/a.dart", "class A {}");
     Source librarySource = addSource("/lib.dart", EngineTestCase.createSource(["library lib;", "", "part 'a.dart';"]));
     LibraryElement element = buildLibrary(librarySource, [CompileTimeErrorCode.PART_OF_NON_PART]);
     JUnitTestCase.assertNotNull(element);
   }
+
   void test_multipleFiles() {
     Source librarySource = addSource("/lib.dart", EngineTestCase.createSource([
         "library lib;",
         "part 'first.dart';",
         "part 'second.dart';",
         "",
         "class A {}"]));
     addSource("/first.dart", EngineTestCase.createSource(["part of lib;", "class B {}"]));
     addSource("/second.dart", EngineTestCase.createSource(["part of lib;", "class C {}"]));
     LibraryElement element = buildLibrary(librarySource, []);
     JUnitTestCase.assertNotNull(element);
     List<CompilationUnitElement> sourcedUnits = element.parts;
     EngineTestCase.assertLength(2, sourcedUnits);
     assertTypes(element.definingCompilationUnit, ["A"]);
     if (sourcedUnits[0].name == "first.dart") {
       assertTypes(sourcedUnits[0], ["B"]);
       assertTypes(sourcedUnits[1], ["C"]);
     } else {
       assertTypes(sourcedUnits[0], ["C"]);
       assertTypes(sourcedUnits[1], ["B"]);
     }
   }
+
   void test_singleFile() {
     Source librarySource = addSource("/lib.dart", EngineTestCase.createSource(["library lib;", "", "class A {}"]));
     LibraryElement element = buildLibrary(librarySource, []);
     JUnitTestCase.assertNotNull(element);
     assertTypes(element.definingCompilationUnit, ["A"]);
   }
 
   /**
    * Add a source file to the content provider. The file path should be absolute.
    *
@@ skipping 48 matching lines @@
         new FileUriResolver()]);
     LibraryResolver resolver = new LibraryResolver(context);
     LibraryElementBuilder builder = new LibraryElementBuilder(resolver);
     Library library = resolver.createLibrary(librarySource) as Library;
     LibraryElement element = builder.buildLibrary(library);
     GatheringErrorListener listener = new GatheringErrorListener();
     listener.addAll(resolver.errorListener);
     listener.assertErrors2(expectedErrorCodes);
     return element;
   }
+
   static dartSuite() {
     _ut.group('LibraryElementBuilderTest', () {
       _ut.test('test_accessorsAcrossFiles', () {
         final __test = new LibraryElementBuilderTest();
         runJUnitTest(__test, __test.test_accessorsAcrossFiles);
       });
       _ut.test('test_empty', () {
         final __test = new LibraryElementBuilderTest();
         runJUnitTest(__test, __test.test_empty);
       });
@@ skipping 13 matching lines @@
         final __test = new LibraryElementBuilderTest();
         runJUnitTest(__test, __test.test_multipleFiles);
       });
       _ut.test('test_singleFile', () {
         final __test = new LibraryElementBuilderTest();
         runJUnitTest(__test, __test.test_singleFile);
       });
     });
   }
 }
+
 class ScopeTest extends ResolverTestCase {
   void test_define_duplicate() {
     GatheringErrorListener errorListener = new GatheringErrorListener();
     ScopeTest_TestScope scope = new ScopeTest_TestScope(errorListener);
     VariableElement element1 = ElementFactory.localVariableElement(ASTFactory.identifier3("v1"));
     VariableElement element2 = ElementFactory.localVariableElement(ASTFactory.identifier3("v1"));
     scope.define(element1);
     scope.define(element2);
     errorListener.assertErrors3([ErrorSeverity.ERROR]);
   }
+
   void test_define_normal() {
     GatheringErrorListener errorListener = new GatheringErrorListener();
     ScopeTest_TestScope scope = new ScopeTest_TestScope(errorListener);
     VariableElement element1 = ElementFactory.localVariableElement(ASTFactory.identifier3("v1"));
     VariableElement element2 = ElementFactory.localVariableElement(ASTFactory.identifier3("v2"));
     scope.define(element1);
     scope.define(element2);
     errorListener.assertNoErrors();
   }
+
   void test_getErrorListener() {
     GatheringErrorListener errorListener = new GatheringErrorListener();
     ScopeTest_TestScope scope = new ScopeTest_TestScope(errorListener);
     JUnitTestCase.assertEquals(errorListener, scope.errorListener);
   }
+
   void test_isPrivateName_nonPrivate() {
     JUnitTestCase.assertFalse(Scope.isPrivateName("Public"));
   }
+
   void test_isPrivateName_private() {
     JUnitTestCase.assertTrue(Scope.isPrivateName("_Private"));
   }
+
   static dartSuite() {
     _ut.group('ScopeTest', () {
       _ut.test('test_define_duplicate', () {
         final __test = new ScopeTest();
         runJUnitTest(__test, __test.test_define_duplicate);
       });
       _ut.test('test_define_normal', () {
         final __test = new ScopeTest();
         runJUnitTest(__test, __test.test_define_normal);
       });
       _ut.test('test_getErrorListener', () {
         final __test = new ScopeTest();
         runJUnitTest(__test, __test.test_getErrorListener);
       });
       _ut.test('test_isPrivateName_nonPrivate', () {
         final __test = new ScopeTest();
         runJUnitTest(__test, __test.test_isPrivateName_nonPrivate);
       });
       _ut.test('test_isPrivateName_private', () {
         final __test = new ScopeTest();
         runJUnitTest(__test, __test.test_isPrivateName_private);
       });
     });
   }
 }
+
 /**
  * A non-abstract subclass that can be used for testing purposes.
  */
 class ScopeTest_TestScope extends Scope {
-
   /**
    * The listener that is to be informed when an error is encountered.
    */
   AnalysisErrorListener _errorListener;
+
   ScopeTest_TestScope(AnalysisErrorListener errorListener) {
     this._errorListener = errorListener;
   }
+
   AnalysisErrorListener get errorListener => _errorListener;
+
   Element lookup3(Identifier identifier, String name, LibraryElement referencingLibrary) => localLookup(name, referencingLibrary);
 }
+
 class SimpleResolverTest extends ResolverTestCase {
   void fail_staticInvocation() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  static int get g => (a,b) => 0;",
         "}",
         "class B {",
         "  f() {",
         "    A.g(1,0);",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_argumentResolution_required_matching() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void f() {",
         "    g(1, 2, 3);",
         "  }",
         "  void g(a, b, c) {}",
         "}"]));
     validateArgumentResolution(source, [0, 1, 2]);
   }
+
   void test_argumentResolution_required_tooFew() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void f() {",
         "    g(1, 2);",
         "  }",
         "  void g(a, b, c) {}",
         "}"]));
     validateArgumentResolution(source, [0, 1]);
   }
+
   void test_argumentResolution_required_tooMany() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void f() {",
         "    g(1, 2, 3);",
         "  }",
         "  void g(a, b) {}",
         "}"]));
     validateArgumentResolution(source, [0, 1, -1]);
   }
+
   void test_argumentResolution_requiredAndNamed_extra() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void f() {",
         "    g(1, 2, c: 3, d: 4);",
         "  }",
         "  void g(a, b, {c}) {}",
         "}"]));
     validateArgumentResolution(source, [0, 1, 2, -1]);
   }
+
   void test_argumentResolution_requiredAndNamed_matching() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void f() {",
         "    g(1, 2, c: 3);",
         "  }",
         "  void g(a, b, {c}) {}",
         "}"]));
     validateArgumentResolution(source, [0, 1, 2]);
   }
+
   void test_argumentResolution_requiredAndNamed_missing() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void f() {",
         "    g(1, 2, d: 3);",
         "  }",
         "  void g(a, b, {c, d}) {}",
         "}"]));
     validateArgumentResolution(source, [0, 1, 3]);
   }
+
   void test_argumentResolution_requiredAndPositional_fewer() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void f() {",
         "    g(1, 2, 3);",
         "  }",
         "  void g(a, b, [c, d]) {}",
         "}"]));
     validateArgumentResolution(source, [0, 1, 2]);
   }
+
   void test_argumentResolution_requiredAndPositional_matching() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void f() {",
         "    g(1, 2, 3, 4);",
         "  }",
         "  void g(a, b, [c, d]) {}",
         "}"]));
     validateArgumentResolution(source, [0, 1, 2, 3]);
   }
+
   void test_argumentResolution_requiredAndPositional_more() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void f() {",
         "    g(1, 2, 3, 4);",
         "  }",
         "  void g(a, b, [c]) {}",
         "}"]));
     validateArgumentResolution(source, [0, 1, 2, -1]);
   }
+
   void test_class_definesCall() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int call(int x) { return x; }",
         "}",
         "int f(A a) {",
         "  return a(0);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_class_extends_implements() {
     Source source = addSource(EngineTestCase.createSource([
         "class A extends B implements C {}",
         "class B {}",
         "class C {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_commentReference_class() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {}",
         "/** [A] [new A] [A.n] [new A.n] [m] [f] */",
         "class A {",
         "  A() {}",
         "  A.n() {}",
         "  m() {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_commentReference_parameter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  A() {}",
         "  A.n() {}",
         "  /** [e] [f] */",
         "  m(e, f()) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_commentReference_singleLine() {
     Source source = addSource(EngineTestCase.createSource(["/// [A]", "class A {}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_empty() {
     Source source = addSource("");
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_extractedMethodAsConstant() {
     Source source = addSource(EngineTestCase.createSource([
         "abstract class Comparable<T> {",
         "  int compareTo(T other);",
         "  static int compare(Comparable a, Comparable b) => a.compareTo(b);",
         "}",
         "class A {",
         "  void sort([compare = Comparable.compare]) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_fieldFormalParameter() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  int x;", "  A(this.x) {}", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_forEachLoops_nonConflicting() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {",
         "  List list = [1,2,3];",
         "  for (int x in list) {}",
         "  for (int x in list) {}",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_forLoops_nonConflicting() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {",
         "  for (int i = 0; i < 3; i++) {",
         "  }",
         "  for (int i = 0; i < 3; i++) {",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_functionTypeAlias() {
     Source source = addSource(EngineTestCase.createSource([
         "typedef bool P(e);",
         "class A {",
         "  P p;",
         "  m(e) {",
         "    if (p(e)) {}",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_getterAndSetterWithDifferentTypes() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int get f => 0;",
         "  void set f(String s) {}",
         "}",
         "g (A a) {",
         "  a.f = a.f.toString();",
         "}"]));
     resolve(source);
     assertErrors(source, [StaticWarningCode.MISMATCHED_GETTER_AND_SETTER_TYPES]);
     verify([source]);
   }
+
   void test_hasReferenceToSuper() {
     Source source = addSource(EngineTestCase.createSource(["class A {}", "class B {toString() => super.toString();}"]));
     LibraryElement library = resolve(source);
     JUnitTestCase.assertNotNull(library);
     CompilationUnitElement unit = library.definingCompilationUnit;
     JUnitTestCase.assertNotNull(unit);
     List<ClassElement> classes = unit.types;
     EngineTestCase.assertLength(2, classes);
     JUnitTestCase.assertFalse(classes[0].hasReferenceToSuper());
     JUnitTestCase.assertTrue(classes[1].hasReferenceToSuper());
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_import_hide() {
     addSource2("lib1.dart", EngineTestCase.createSource(["library lib1;", "set foo(value) {}", "class A {}"]));
     addSource2("lib2.dart", EngineTestCase.createSource(["library lib2;", "set foo(value) {}"]));
     Source source = addSource2("lib3.dart", EngineTestCase.createSource([
         "import 'lib1.dart' hide foo;",
         "import 'lib2.dart';",
         "",
         "main() {",
         "  foo = 0;",
         "}",
         "A a;"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_import_prefix() {
     addSource2("/two.dart", EngineTestCase.createSource(["library two;", "f(int x) {", "  return x * x;", "}"]));
     Source source = addSource2("/one.dart", EngineTestCase.createSource([
         "library one;",
         "import 'two.dart' as _two;",
         "main() {",
         "  _two.f(0);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_import_spaceInUri() {
     addSource2("sub folder/lib.dart", EngineTestCase.createSource(["library lib;", "foo() {}"]));
     Source source = addSource2("app.dart", EngineTestCase.createSource([
         "import 'sub folder/lib.dart';",
         "",
         "main() {",
         "  foo();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_indexExpression_typeParameters() {
     Source source = addSource(EngineTestCase.createSource([
         "f() {",
         "  List<int> a;",
         "  a[0];",
         "  List<List<int>> b;",
         "  b[0][0];",
         "  List<List<List<int>>> c;",
         "  c[0][0][0];",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_indexExpression_typeParameters_invalidAssignmentWarning() {
     Source source = addSource(EngineTestCase.createSource(["f() {", "  List<List<int>> b;", "  b[0][0] = 'hi';", "}"]));
     resolve(source);
     assertErrors(source, [StaticTypeWarningCode.INVALID_ASSIGNMENT]);
     verify([source]);
   }
+
   void test_indirectOperatorThroughCall() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  B call() { return new B(); }",
         "}",
         "",
         "class B {",
         "  int operator [](int i) { return i; }",
         "}",
         "",
         "A f = new A();",
         "",
         "g(int x) {}",
         "",
         "main() {",
         "  g(f()[0]);",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_invoke_dynamicThroughGetter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  List get X => [() => 0];",
         "  m(A a) {",
         "    X.last;",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_isValidMixin_badSuperclass() {
     Source source = addSource(EngineTestCase.createSource(["class A extends B {}", "class B {}"]));
     LibraryElement library = resolve(source);
     JUnitTestCase.assertNotNull(library);
     CompilationUnitElement unit = library.definingCompilationUnit;
     JUnitTestCase.assertNotNull(unit);
     List<ClassElement> classes = unit.types;
     EngineTestCase.assertLength(2, classes);
     JUnitTestCase.assertFalse(classes[0].isValidMixin);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_isValidMixin_constructor() {
     Source source = addSource(EngineTestCase.createSource(["class A {", "  A() {}", "}"]));
     LibraryElement library = resolve(source);
     JUnitTestCase.assertNotNull(library);
     CompilationUnitElement unit = library.definingCompilationUnit;
     JUnitTestCase.assertNotNull(unit);
     List<ClassElement> classes = unit.types;
     EngineTestCase.assertLength(1, classes);
     JUnitTestCase.assertFalse(classes[0].isValidMixin);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_isValidMixin_super() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  toString() {",
         "    return super.toString();",
         "  }",
         "}"]));
     LibraryElement library = resolve(source);
     JUnitTestCase.assertNotNull(library);
     CompilationUnitElement unit = library.definingCompilationUnit;
     JUnitTestCase.assertNotNull(unit);
     List<ClassElement> classes = unit.types;
     EngineTestCase.assertLength(1, classes);
     JUnitTestCase.assertFalse(classes[0].isValidMixin);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_isValidMixin_valid() {
     Source source = addSource(EngineTestCase.createSource(["class A {}"]));
     LibraryElement library = resolve(source);
     JUnitTestCase.assertNotNull(library);
     CompilationUnitElement unit = library.definingCompilationUnit;
     JUnitTestCase.assertNotNull(unit);
     List<ClassElement> classes = unit.types;
     EngineTestCase.assertLength(1, classes);
     JUnitTestCase.assertTrue(classes[0].isValidMixin);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_labels_switch() {
     Source source = addSource(EngineTestCase.createSource([
         "void doSwitch(int target) {",
         "  switch (target) {",
         "    l0: case 0:",
         "      continue l1;",
         "    l1: case 1:",
         "      continue l0;",
         "    default:",
         "      continue l1;",
         "  }",
         "}"]));
     LibraryElement library = resolve(source);
     JUnitTestCase.assertNotNull(library);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_metadata_class() {
     Source source = addSource(EngineTestCase.createSource(["const A = null;", "@A class C {}"]));
     LibraryElement library = resolve(source);
     JUnitTestCase.assertNotNull(library);
     CompilationUnitElement unit = library.definingCompilationUnit;
     JUnitTestCase.assertNotNull(unit);
     List<ClassElement> classes = unit.types;
     EngineTestCase.assertLength(1, classes);
     List<ElementAnnotation> annotations = classes[0].metadata;
     EngineTestCase.assertLength(1, annotations);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_metadata_field() {
     Source source = addSource(EngineTestCase.createSource(["const A = null;", "class C {", "  @A int f;", "}"]));
     LibraryElement library = resolve(source);
     JUnitTestCase.assertNotNull(library);
     CompilationUnitElement unit = library.definingCompilationUnit;
     JUnitTestCase.assertNotNull(unit);
     List<ClassElement> classes = unit.types;
     EngineTestCase.assertLength(1, classes);
     FieldElement field = classes[0].fields[0];
     List<ElementAnnotation> annotations = field.metadata;
     EngineTestCase.assertLength(1, annotations);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_metadata_libraryDirective() {
     Source source = addSource(EngineTestCase.createSource(["@A library lib;", "const A = null;"]));
     LibraryElement library = resolve(source);
     JUnitTestCase.assertNotNull(library);
     List<ElementAnnotation> annotations = library.metadata;
     EngineTestCase.assertLength(1, annotations);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_metadata_method() {
     Source source = addSource(EngineTestCase.createSource(["const A = null;", "class C {", "  @A void m() {}", "}"]));
     LibraryElement library = resolve(source);
     JUnitTestCase.assertNotNull(library);
     CompilationUnitElement unit = library.definingCompilationUnit;
     JUnitTestCase.assertNotNull(unit);
     List<ClassElement> classes = unit.types;
     EngineTestCase.assertLength(1, classes);
     MethodElement method = classes[0].methods[0];
     List<ElementAnnotation> annotations = method.metadata;
     EngineTestCase.assertLength(1, annotations);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_method_fromMixin() {
     Source source = addSource(EngineTestCase.createSource([
         "class B {",
         "  bar() => 1;",
         "}",
         "class A {",
         "  foo() => 2;",
         "}",
         "",
         "class C extends B with A {",
         "  bar() => super.bar();",
         "  foo() => super.foo();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_method_fromSuperclassMixin() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void m1() {}",
         "}",
         "class B extends Object with A {",
         "}",
         "class C extends B {",
         "}",
         "f(C c) {",
         "  c.m1();",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_methodCascades() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  void m1() {}",
         "  void m2() {}",
         "  void m() {",
         "    A a = new A();",
         "    a..m1()",
         "     ..m2();",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_methodCascades_withSetter() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  String name;",
         "  void m1() {}",
         "  void m2() {}",
         "  void m() {",
         "    A a = new A();",
         "    a..m1()",
         "     ..name = 'name'",
         "     ..m2();",
         "  }",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_resolveAgainstNull() {
     Source source = addSource(EngineTestCase.createSource(["f(var p) {", "  return null == p;", "}"]));
     resolve(source);
     assertNoErrors(source);
   }
+
   void test_setter_inherited() {
     Source source = addSource(EngineTestCase.createSource([
         "class A {",
         "  int get x => 0;",
         "  set x(int p) {}",
         "}",
         "class B extends A {",
         "  int get x => super.x == null ? 0 : super.x;",
         "  int f() => x = 1;",
         "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
+
   void test_setter_static() {
     Source source = addSource(EngineTestCase.createSource(["set s(x) {", "}", "", "main() {", "  s = 123;", "}"]));
     resolve(source);
     assertNoErrors(source);
     verify([source]);
   }
 
   /**
    * Resolve the given source and verify that the arguments in a specific method invocation were
    * correctly resolved.
@@ skipping 17 matching lines @@
    */
   void validateArgumentResolution(Source source, List<int> indices) {
     LibraryElement library = resolve(source);
     JUnitTestCase.assertNotNull(library);
     ClassElement classElement = library.definingCompilationUnit.types[0];
     List<ParameterElement> parameters = classElement.methods[1].parameters;
     CompilationUnit unit = resolveCompilationUnit(source, library);
     JUnitTestCase.assertNotNull(unit);
     ClassDeclaration classDeclaration = unit.declarations[0] as ClassDeclaration;
     MethodDeclaration methodDeclaration = classDeclaration.members[0] as MethodDeclaration;
-    Block block = ((methodDeclaration.body as BlockFunctionBody)).block;
+    Block block = (methodDeclaration.body as BlockFunctionBody).block;
     ExpressionStatement statement = block.statements[0] as ExpressionStatement;
     MethodInvocation invocation = statement.expression as MethodInvocation;
     NodeList<Expression> arguments = invocation.argumentList.arguments;
     int argumentCount = arguments.length;
     JUnitTestCase.assertEquals(indices.length, argumentCount);
     for (int i = 0; i < argumentCount; i++) {
       Expression argument = arguments[i];
       ParameterElement element = argument.staticParameterElement;
       int index = indices[i];
       if (index < 0) {
         JUnitTestCase.assertNull(element);
       } else {
         JUnitTestCase.assertSame(parameters[index], element);
       }
     }
   }
+
   static dartSuite() {
     _ut.group('SimpleResolverTest', () {
       _ut.test('test_argumentResolution_requiredAndNamed_extra', () {
         final __test = new SimpleResolverTest();
         runJUnitTest(__test, __test.test_argumentResolution_requiredAndNamed_extra);
       });
       _ut.test('test_argumentResolution_requiredAndNamed_matching', () {
         final __test = new SimpleResolverTest();
         runJUnitTest(__test, __test.test_argumentResolution_requiredAndNamed_matching);
       });
@@ skipping 165 matching lines @@
         final __test = new SimpleResolverTest();
         runJUnitTest(__test, __test.test_setter_inherited);
       });
       _ut.test('test_setter_static', () {
         final __test = new SimpleResolverTest();
         runJUnitTest(__test, __test.test_setter_static);
       });
     });
   }
 }
+
 class SubtypeManagerTest extends EngineTestCase {
-
   /**
    * The inheritance manager being tested.
    */
   SubtypeManager _subtypeManager;
 
   /**
    * The compilation unit element containing all of the types setup in each test.
    */
   CompilationUnitElementImpl _definingCompilationUnit;
+
   void test_computeAllSubtypes_infiniteLoop() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     ClassElementImpl classB = ElementFactory.classElement("B", classA.type, []);
     classA.supertype = classB.type;
     _definingCompilationUnit.types = <ClassElement> [classA, classB];
     Set<ClassElement> subtypesOfA = _subtypeManager.computeAllSubtypes(classA);
     List<ClassElement> arraySubtypesOfA = new List.from(subtypesOfA);
     EngineTestCase.assertSize3(2, subtypesOfA);
     EngineTestCase.assertContains(arraySubtypesOfA, [classA, classB]);
   }
+
   void test_computeAllSubtypes_manyRecursiveSubtypes() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     ClassElementImpl classB = ElementFactory.classElement("B", classA.type, []);
     ClassElementImpl classC = ElementFactory.classElement("C", classB.type, []);
     ClassElementImpl classD = ElementFactory.classElement("D", classB.type, []);
     ClassElementImpl classE = ElementFactory.classElement("E", classB.type, []);
     _definingCompilationUnit.types = <ClassElement> [classA, classB, classC, classD, classE];
     Set<ClassElement> subtypesOfA = _subtypeManager.computeAllSubtypes(classA);
     List<ClassElement> arraySubtypesOfA = new List.from(subtypesOfA);
     Set<ClassElement> subtypesOfB = _subtypeManager.computeAllSubtypes(classB);
     List<ClassElement> arraySubtypesOfB = new List.from(subtypesOfB);
     EngineTestCase.assertSize3(4, subtypesOfA);
     EngineTestCase.assertContains(arraySubtypesOfA, [classB, classC, classD, classE]);
     EngineTestCase.assertSize3(3, subtypesOfB);
     EngineTestCase.assertContains(arraySubtypesOfB, [classC, classD, classE]);
   }
+
   void test_computeAllSubtypes_noSubtypes() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     _definingCompilationUnit.types = <ClassElement> [classA];
     Set<ClassElement> subtypesOfA = _subtypeManager.computeAllSubtypes(classA);
     EngineTestCase.assertSize3(0, subtypesOfA);
   }
+
   void test_computeAllSubtypes_oneSubtype() {
     ClassElementImpl classA = ElementFactory.classElement2("A", []);
     ClassElementImpl classB = ElementFactory.classElement("B", classA.type, []);
     _definingCompilationUnit.types = <ClassElement> [classA, classB];
     Set<ClassElement> subtypesOfA = _subtypeManager.computeAllSubtypes(classA);
     List<ClassElement> arraySubtypesOfA = new List.from(subtypesOfA);
     EngineTestCase.assertSize3(1, subtypesOfA);
     EngineTestCase.assertContains(arraySubtypesOfA, [classB]);
   }
+
   void setUp() {
     super.setUp();
     AnalysisContextImpl context = AnalysisContextFactory.contextWithCore();
     FileBasedSource source = new FileBasedSource.con1(new ContentCache(), FileUtilities2.createFile("/test.dart"));
     _definingCompilationUnit = new CompilationUnitElementImpl("test.dart");
     _definingCompilationUnit.source = source;
     LibraryElementImpl definingLibrary = ElementFactory.library(context, "test");
     definingLibrary.definingCompilationUnit = _definingCompilationUnit;
     _subtypeManager = new SubtypeManager();
   }
+
   static dartSuite() {
     _ut.group('SubtypeManagerTest', () {
       _ut.test('test_computeAllSubtypes_infiniteLoop', () {
         final __test = new SubtypeManagerTest();
         runJUnitTest(__test, __test.test_computeAllSubtypes_infiniteLoop);
       });
       _ut.test('test_computeAllSubtypes_manyRecursiveSubtypes', () {
         final __test = new SubtypeManagerTest();
         runJUnitTest(__test, __test.test_computeAllSubtypes_manyRecursiveSubtypes);
       });
       _ut.test('test_computeAllSubtypes_noSubtypes', () {
         final __test = new SubtypeManagerTest();
         runJUnitTest(__test, __test.test_computeAllSubtypes_noSubtypes);
       });
       _ut.test('test_computeAllSubtypes_oneSubtype', () {
         final __test = new SubtypeManagerTest();
         runJUnitTest(__test, __test.test_computeAllSubtypes_oneSubtype);
       });
     });
   }
 }
+
+class ScopeBuilderTest extends EngineTestCase {
+  void test_scopeFor_ClassDeclaration() {
+    GatheringErrorListener listener = new GatheringErrorListener();
+    Scope scope = ScopeBuilder.scopeFor(createResolvedClassDeclaration(), listener);
+    EngineTestCase.assertInstanceOf(LibraryScope, scope);
+  }
+
+  void test_scopeFor_ClassTypeAlias() {
+    GatheringErrorListener listener = new GatheringErrorListener();
+    Scope scope = ScopeBuilder.scopeFor(createResolvedClassTypeAlias(), listener);
+    EngineTestCase.assertInstanceOf(LibraryScope, scope);
+  }
+
+  void test_scopeFor_CompilationUnit() {
+    GatheringErrorListener listener = new GatheringErrorListener();
+    Scope scope = ScopeBuilder.scopeFor(createResolvedCompilationUnit(), listener);
+    EngineTestCase.assertInstanceOf(LibraryScope, scope);
+  }
+
+  void test_scopeFor_ConstructorDeclaration() {
+    GatheringErrorListener listener = new GatheringErrorListener();
+    Scope scope = ScopeBuilder.scopeFor(createResolvedConstructorDeclaration(), listener);
+    EngineTestCase.assertInstanceOf(ClassScope, scope);
+  }
+
+  void test_scopeFor_ConstructorDeclaration_parameters() {
+    GatheringErrorListener listener = new GatheringErrorListener();
+    Scope scope = ScopeBuilder.scopeFor(createResolvedConstructorDeclaration().parameters, listener);
+    EngineTestCase.assertInstanceOf(FunctionScope, scope);
+  }
+
+  void test_scopeFor_FunctionDeclaration() {
+    GatheringErrorListener listener = new GatheringErrorListener();
+    Scope scope = ScopeBuilder.scopeFor(createResolvedFunctionDeclaration(), listener);
+    EngineTestCase.assertInstanceOf(LibraryScope, scope);
+  }
+
+  void test_scopeFor_FunctionDeclaration_parameters() {
+    GatheringErrorListener listener = new GatheringErrorListener();
+    Scope scope = ScopeBuilder.scopeFor(createResolvedFunctionDeclaration().functionExpression.parameters, listener);
+    EngineTestCase.assertInstanceOf(FunctionScope, scope);
+  }
+
+  void test_scopeFor_FunctionTypeAlias() {
+    GatheringErrorListener listener = new GatheringErrorListener();
+    Scope scope = ScopeBuilder.scopeFor(createResolvedFunctionTypeAlias(), listener);
+    EngineTestCase.assertInstanceOf(LibraryScope, scope);
+  }
+
+  void test_scopeFor_FunctionTypeAlias_parameters() {
+    GatheringErrorListener listener = new GatheringErrorListener();
+    Scope scope = ScopeBuilder.scopeFor(createResolvedFunctionTypeAlias().parameters, listener);
+    EngineTestCase.assertInstanceOf(FunctionTypeScope, scope);
+  }
+
+  void test_scopeFor_MethodDeclaration() {
+    GatheringErrorListener listener = new GatheringErrorListener();
+    Scope scope = ScopeBuilder.scopeFor(createResolvedMethodDeclaration(), listener);
+    EngineTestCase.assertInstanceOf(ClassScope, scope);
+  }
+
+  void test_scopeFor_MethodDeclaration_body() {
+    GatheringErrorListener listener = new GatheringErrorListener();
+    Scope scope = ScopeBuilder.scopeFor(createResolvedMethodDeclaration().body, listener);
+    EngineTestCase.assertInstanceOf(FunctionScope, scope);
+  }
+
+  void test_scopeFor_notInCompilationUnit() {
+    GatheringErrorListener listener = new GatheringErrorListener();
+    try {
+      ScopeBuilder.scopeFor(ASTFactory.identifier3("x"), listener);
+      JUnitTestCase.fail("Expected AnalysisException");
+    } on AnalysisException catch (exception) {
+    }
+  }
+
+  void test_scopeFor_null() {
+    GatheringErrorListener listener = new GatheringErrorListener();
+    try {
+      ScopeBuilder.scopeFor(null, listener);
+      JUnitTestCase.fail("Expected AnalysisException");
+    } on AnalysisException catch (exception) {
+    }
+  }
+
+  void test_scopeFor_unresolved() {
+    GatheringErrorListener listener = new GatheringErrorListener();
+    try {
+      ScopeBuilder.scopeFor(ASTFactory.compilationUnit(), listener);
+      JUnitTestCase.fail("Expected AnalysisException");
+    } on AnalysisException catch (exception) {
+    }
+  }
+
+  ClassDeclaration createResolvedClassDeclaration() {
+    CompilationUnit unit = createResolvedCompilationUnit();
+    String className = "C";
+    ClassDeclaration classNode = ASTFactory.classDeclaration(null, className, ASTFactory.typeParameterList([]), null, null, null, []);
+    unit.declarations.add(classNode);
+    ClassElement classElement = ElementFactory.classElement2(className, []);
+    classNode.name.staticElement = classElement;
+    (unit.element as CompilationUnitElementImpl).types = <ClassElement> [classElement];
+    return classNode;
+  }
+
+  ClassTypeAlias createResolvedClassTypeAlias() {
+    CompilationUnit unit = createResolvedCompilationUnit();
+    String className = "C";
+    ClassTypeAlias classNode = ASTFactory.classTypeAlias(className, ASTFactory.typeParameterList([]), null, null, null, null);
+    unit.declarations.add(classNode);
+    ClassElement classElement = ElementFactory.classElement2(className, []);
+    classNode.name.staticElement = classElement;
+    (unit.element as CompilationUnitElementImpl).types = <ClassElement> [classElement];
+    return classNode;
+  }
+
+  CompilationUnit createResolvedCompilationUnit() {
+    CompilationUnit unit = ASTFactory.compilationUnit();
+    LibraryElementImpl library = ElementFactory.library(AnalysisContextFactory.contextWithCore(), "lib");
+    unit.element = library.definingCompilationUnit;
+    return unit;
+  }
+
+  ConstructorDeclaration createResolvedConstructorDeclaration() {
+    ClassDeclaration classNode = createResolvedClassDeclaration();
+    String constructorName = "f";
+    ConstructorDeclaration constructorNode = ASTFactory.constructorDeclaration(ASTFactory.identifier3(constructorName), null, ASTFactory.formalParameterList([]), null);
+    classNode.members.add(constructorNode);
+    ConstructorElement constructorElement = ElementFactory.constructorElement2(classNode.element, null, []);
+    constructorNode.element = constructorElement;
+    (classNode.element as ClassElementImpl).constructors = <ConstructorElement> [constructorElement];
+    return constructorNode;
+  }
+
+  FunctionDeclaration createResolvedFunctionDeclaration() {
+    CompilationUnit unit = createResolvedCompilationUnit();
+    String functionName = "f";
+    FunctionDeclaration functionNode = ASTFactory.functionDeclaration(null, null, functionName, ASTFactory.functionExpression());
+    unit.declarations.add(functionNode);
+    FunctionElement functionElement = ElementFactory.functionElement(functionName);
+    functionNode.name.staticElement = functionElement;
+    (unit.element as CompilationUnitElementImpl).functions = <FunctionElement> [functionElement];
+    return functionNode;
+  }
+
+  FunctionTypeAlias createResolvedFunctionTypeAlias() {
+    CompilationUnit unit = createResolvedCompilationUnit();
+    FunctionTypeAlias aliasNode = ASTFactory.typeAlias(ASTFactory.typeName4("A", []), "F", ASTFactory.typeParameterList([]), ASTFactory.formalParameterList([]));
+    unit.declarations.add(aliasNode);
+    SimpleIdentifier aliasName = aliasNode.name;
+    FunctionTypeAliasElement aliasElement = new FunctionTypeAliasElementImpl(aliasName);
+    aliasName.staticElement = aliasElement;
+    (unit.element as CompilationUnitElementImpl).typeAliases = <FunctionTypeAliasElement> [aliasElement];
+    return aliasNode;
+  }
+
+  MethodDeclaration createResolvedMethodDeclaration() {
+    ClassDeclaration classNode = createResolvedClassDeclaration();
+    String methodName = "f";
+    MethodDeclaration methodNode = ASTFactory.methodDeclaration(null, null, null, null, ASTFactory.identifier3(methodName), ASTFactory.formalParameterList([]));
+    classNode.members.add(methodNode);
+    MethodElement methodElement = ElementFactory.methodElement(methodName, null, []);
+    methodNode.name.staticElement = methodElement;
+    (classNode.element as ClassElementImpl).methods = <MethodElement> [methodElement];
+    return methodNode;
+  }
+
+  static dartSuite() {
+    _ut.group('ScopeBuilderTest', () {
+      _ut.test('test_scopeFor_ClassDeclaration', () {
+        final __test = new ScopeBuilderTest();
+        runJUnitTest(__test, __test.test_scopeFor_ClassDeclaration);
+      });
+      _ut.test('test_scopeFor_ClassTypeAlias', () {
+        final __test = new ScopeBuilderTest();
+        runJUnitTest(__test, __test.test_scopeFor_ClassTypeAlias);
+      });
+      _ut.test('test_scopeFor_CompilationUnit', () {
+        final __test = new ScopeBuilderTest();
+        runJUnitTest(__test, __test.test_scopeFor_CompilationUnit);
+      });
+      _ut.test('test_scopeFor_ConstructorDeclaration', () {
+        final __test = new ScopeBuilderTest();
+        runJUnitTest(__test, __test.test_scopeFor_ConstructorDeclaration);
+      });
+      _ut.test('test_scopeFor_ConstructorDeclaration_parameters', () {
+        final __test = new ScopeBuilderTest();
+        runJUnitTest(__test, __test.test_scopeFor_ConstructorDeclaration_parameters);
+      });
+      _ut.test('test_scopeFor_FunctionDeclaration', () {
+        final __test = new ScopeBuilderTest();
+        runJUnitTest(__test, __test.test_scopeFor_FunctionDeclaration);
+      });
+      _ut.test('test_scopeFor_FunctionDeclaration_parameters', () {
+        final __test = new ScopeBuilderTest();
+        runJUnitTest(__test, __test.test_scopeFor_FunctionDeclaration_parameters);
+      });
+      _ut.test('test_scopeFor_FunctionTypeAlias', () {
+        final __test = new ScopeBuilderTest();
+        runJUnitTest(__test, __test.test_scopeFor_FunctionTypeAlias);
+      });
+      _ut.test('test_scopeFor_FunctionTypeAlias_parameters', () {
+        final __test = new ScopeBuilderTest();
+        runJUnitTest(__test, __test.test_scopeFor_FunctionTypeAlias_parameters);
+      });
+      _ut.test('test_scopeFor_MethodDeclaration', () {
+        final __test = new ScopeBuilderTest();
+        runJUnitTest(__test, __test.test_scopeFor_MethodDeclaration);
+      });
+      _ut.test('test_scopeFor_MethodDeclaration_body', () {
+        final __test = new ScopeBuilderTest();
+        runJUnitTest(__test, __test.test_scopeFor_MethodDeclaration_body);
+      });
+      _ut.test('test_scopeFor_notInCompilationUnit', () {
+        final __test = new ScopeBuilderTest();
+        runJUnitTest(__test, __test.test_scopeFor_notInCompilationUnit);
+      });
+      _ut.test('test_scopeFor_null', () {
+        final __test = new ScopeBuilderTest();
+        runJUnitTest(__test, __test.test_scopeFor_null);
+      });
+      _ut.test('test_scopeFor_unresolved', () {
+        final __test = new ScopeBuilderTest();
+        runJUnitTest(__test, __test.test_scopeFor_unresolved);
+      });
+    });
+  }
+}
+
 main() {
-//  ElementResolverTest.dartSuite();
-//  InheritanceManagerTest.dartSuite();
-//  LibraryElementBuilderTest.dartSuite();
-//  LibraryTest.dartSuite();
-//  StaticTypeAnalyzerTest.dartSuite();
-//  SubtypeManagerTest.dartSuite();
-//  TypeOverrideManagerTest.dartSuite();
-//  TypeProviderImplTest.dartSuite();
-//  TypeResolverVisitorTest.dartSuite();
-//  EnclosedScopeTest.dartSuite();
-//  LibraryImportScopeTest.dartSuite();
-//  LibraryScopeTest.dartSuite();
-//  ScopeTest.dartSuite();
-//  CompileTimeErrorCodeTest.dartSuite();
-//  ErrorResolverTest.dartSuite();
-//  HintCodeTest.dartSuite();
-//  MemberMapTest.dartSuite();
-//  NonHintCodeTest.dartSuite();
-//  NonErrorResolverTest.dartSuite();
-//  SimpleResolverTest.dartSuite();
-//  StaticTypeWarningCodeTest.dartSuite();
-//  StaticWarningCodeTest.dartSuite();
-//  StrictModeTest.dartSuite();
-//  TypePropagationTest.dartSuite();
+  DeclarationMatcherTest.dartSuite();
+  ElementResolverTest.dartSuite();
+  IncrementalResolverTest.dartSuite();
+  InheritanceManagerTest.dartSuite();
+  LibraryElementBuilderTest.dartSuite();
+  LibraryTest.dartSuite();
+  StaticTypeAnalyzerTest.dartSuite();
+  SubtypeManagerTest.dartSuite();
+  TypeOverrideManagerTest.dartSuite();
+  TypeProviderImplTest.dartSuite();
+  TypeResolverVisitorTest.dartSuite();
+  EnclosedScopeTest.dartSuite();
+  LibraryImportScopeTest.dartSuite();
+  LibraryScopeTest.dartSuite();
+  ScopeBuilderTest.dartSuite();
+  ScopeTest.dartSuite();
+  CompileTimeErrorCodeTest.dartSuite();
+  ErrorResolverTest.dartSuite();
+  HintCodeTest.dartSuite();
+  MemberMapTest.dartSuite();
+  NonHintCodeTest.dartSuite();
+  NonErrorResolverTest.dartSuite();
+  SimpleResolverTest.dartSuite();
+  StaticTypeWarningCodeTest.dartSuite();
+  StaticWarningCodeTest.dartSuite();
+  StrictModeTest.dartSuite();
+  TypePropagationTest.dartSuite();
 }