pkg/analyzer/test/generated/resolver_test.dart - Issue 712083003: Create fewer unnecessary lists

Unified Diff: pkg/analyzer/test/generated/resolver_test.dart

Issue 712083003: Create fewer unnecessary lists (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: pkg/analyzer/test/generated/resolver_test.dart

diff --git a/pkg/analyzer/test/generated/resolver_test.dart b/pkg/analyzer/test/generated/resolver_test.dart

index 52d5731cd7c1dc54dff6dc1641c4c3b198b4f76c..d59e47366c4af3aad53d140591ce4fd7332e5821 100644

--- a/pkg/analyzer/test/generated/resolver_test.dart

+++ b/pkg/analyzer/test/generated/resolver_test.dart

@@ -88,7 +88,7 @@ class AnalysisContextFactory {

Source coreSource = sourceFactory.forUri(DartSdk.DART_CORE);

coreContext.setContents(coreSource, "");

coreUnit.source = coreSource;

- ClassElementImpl proxyClassElement = ElementFactory.classElement2("_Proxy", []);

+ ClassElementImpl proxyClassElement = ElementFactory.classElement2("_Proxy");

coreUnit.types = <ClassElement> [

provider.boolType.element,

provider.deprecatedType.element,

@@ -127,7 +127,7 @@ class AnalysisContextFactory {

ClassElementImpl futureElement = ElementFactory.classElement2("Future", ["T"]);

InterfaceType futureType = futureElement.type;

// factory Future.value([value])

- ConstructorElementImpl futureConstructor = ElementFactory.constructorElement2(futureElement, "value", []);

+ ConstructorElementImpl futureConstructor = ElementFactory.constructorElement2(futureElement, "value");

futureConstructor.parameters = <ParameterElement> [ElementFactory.positionalParameter2("value", provider.dynamicType)];

futureConstructor.factory = true;

(futureConstructor.type as FunctionTypeImpl).typeArguments = futureElement.type.typeArguments;

@@ -147,7 +147,7 @@ class AnalysisContextFactory {

futureElement.methods = <MethodElement> [thenMethod];

// Completer

ClassElementImpl completerElement = ElementFactory.classElement2("Completer", ["T"]);

- ConstructorElementImpl completerConstructor = ElementFactory.constructorElement2(completerElement, null, []);

+ ConstructorElementImpl completerConstructor = ElementFactory.constructorElement2(completerElement, null);

(completerConstructor.type as FunctionTypeImpl).typeArguments = completerElement.type.typeArguments;

completerElement.constructors = <ConstructorElement> [completerConstructor];

asyncUnit.types = <ClassElement> [

@@ -163,30 +163,30 @@ class AnalysisContextFactory {

Source htmlSource = sourceFactory.forUri(DartSdk.DART_HTML);

coreContext.setContents(htmlSource, "");

htmlUnit.source = htmlSource;

- ClassElementImpl elementElement = ElementFactory.classElement2("Element", []);

+ ClassElementImpl elementElement = ElementFactory.classElement2("Element");

InterfaceType elementType = elementElement.type;

- ClassElementImpl canvasElement = ElementFactory.classElement("CanvasElement", elementType, []);

- ClassElementImpl contextElement = ElementFactory.classElement2("CanvasRenderingContext", []);

+ ClassElementImpl canvasElement = ElementFactory.classElement("CanvasElement", elementType);

+ ClassElementImpl contextElement = ElementFactory.classElement2("CanvasRenderingContext");

InterfaceType contextElementType = contextElement.type;

- ClassElementImpl context2dElement = ElementFactory.classElement("CanvasRenderingContext2D", contextElementType, []);

+ ClassElementImpl context2dElement = ElementFactory.classElement("CanvasRenderingContext2D", contextElementType);

canvasElement.methods = <MethodElement> [ElementFactory.methodElement("getContext", contextElementType, [provider.stringType])];

canvasElement.accessors = <PropertyAccessorElement> [ElementFactory.getterElement("context2D", false, context2dElement.type)];

- ClassElementImpl documentElement = ElementFactory.classElement("Document", elementType, []);

- ClassElementImpl htmlDocumentElement = ElementFactory.classElement("HtmlDocument", documentElement.type, []);

+ ClassElementImpl documentElement = ElementFactory.classElement("Document", elementType);

+ ClassElementImpl htmlDocumentElement = ElementFactory.classElement("HtmlDocument", documentElement.type);

htmlDocumentElement.methods = <MethodElement> [ElementFactory.methodElement("query", elementType, <DartType> [provider.stringType])];

htmlUnit.types = <ClassElement> [

- ElementFactory.classElement("AnchorElement", elementType, []),

- ElementFactory.classElement("BodyElement", elementType, []),

- ElementFactory.classElement("ButtonElement", elementType, []),

+ ElementFactory.classElement("AnchorElement", elementType),

+ ElementFactory.classElement("BodyElement", elementType),

+ ElementFactory.classElement("ButtonElement", elementType),

canvasElement,

contextElement,

context2dElement,

- ElementFactory.classElement("DivElement", elementType, []),

+ ElementFactory.classElement("DivElement", elementType),

documentElement,

elementElement,

htmlDocumentElement,

- ElementFactory.classElement("InputElement", elementType, []),

- ElementFactory.classElement("SelectElement", elementType, [])];

+ 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", false, true, htmlDocumentElement.type);

htmlUnit.topLevelVariables = <TopLevelVariableElement> [document];

@@ -200,20 +200,20 @@ class AnalysisContextFactory {

Source mathSource = sourceFactory.forUri(_DART_MATH);

coreContext.setContents(mathSource, "");

mathUnit.source = mathSource;

- FunctionElement cosElement = ElementFactory.functionElement3("cos", provider.doubleType.element, <ClassElement> [provider.numType.element], <ClassElement> []);

+ FunctionElement cosElement = ElementFactory.functionElement3("cos", provider.doubleType.element, <ClassElement>[provider.numType.element], ClassElementImpl.EMPTY_ARRAY);

TopLevelVariableElement ln10Element = ElementFactory.topLevelVariableElement3("LN10", true, false, provider.doubleType);

TopLevelVariableElement piElement = ElementFactory.topLevelVariableElement3("PI", true, false, provider.doubleType);

- ClassElementImpl randomElement = ElementFactory.classElement2("Random", []);

+ ClassElementImpl randomElement = ElementFactory.classElement2("Random");

randomElement.abstract = true;

- ConstructorElementImpl randomConstructor = ElementFactory.constructorElement2(randomElement, null, []);

+ ConstructorElementImpl randomConstructor = ElementFactory.constructorElement2(randomElement, null);

randomConstructor.factory = true;

ParameterElementImpl seedParam = new ParameterElementImpl("seed", 0);

seedParam.parameterKind = ParameterKind.POSITIONAL;

seedParam.type = provider.intType;

randomConstructor.parameters = <ParameterElement> [seedParam];

randomElement.constructors = <ConstructorElement> [randomConstructor];

- FunctionElement sinElement = ElementFactory.functionElement3("sin", provider.doubleType.element, <ClassElement> [provider.numType.element], <ClassElement> []);

- FunctionElement sqrtElement = ElementFactory.functionElement3("sqrt", provider.doubleType.element, <ClassElement> [provider.numType.element], <ClassElement> []);

+ FunctionElement sinElement = ElementFactory.functionElement3("sin", provider.doubleType.element, <ClassElement> [provider.numType.element], ClassElementImpl.EMPTY_ARRAY);

+ FunctionElement sqrtElement = ElementFactory.functionElement3("sqrt", provider.doubleType.element, <ClassElement> [provider.numType.element], ClassElementImpl.EMPTY_ARRAY);

mathUnit.accessors = <PropertyAccessorElement> [ln10Element.getter, piElement.getter];

mathUnit.functions = <FunctionElement> [cosElement, sinElement, sqrtElement];

mathUnit.topLevelVariables = <TopLevelVariableElement> [ln10Element, piElement];

@@ -1066,7 +1066,7 @@ class C {

Source source = addSource(oldContent);

LibraryElement library = resolve(source);

CompilationUnit oldUnit = resolveCompilationUnit(source, library);

- CompilationUnit newUnit = ParserTestCase.parseCompilationUnit(newContent, []);

+ CompilationUnit newUnit = ParserTestCase.parseCompilationUnit(newContent);

DeclarationMatcher matcher = new DeclarationMatcher();

expect(matcher.matches(newUnit, oldUnit.element), expectMatch);

}

@@ -1145,7 +1145,7 @@ class ElementResolverTest extends EngineTestCase {

fail("Not yet tested");

// Need to set up the exported library so that the identifier can be resolved

ExportDirective directive = AstFactory.exportDirective2(null, [AstFactory.hideCombinator2(["A"])]);

- _resolveNode(directive, []);

+ _resolveNode(directive);

_listener.assertNoErrors();

}

@@ -1158,7 +1158,7 @@ class ElementResolverTest extends EngineTestCase {

fail("Not yet tested");

// Need to set up the imported library so that the identifier can be resolved

ImportDirective directive = AstFactory.importDirective3(null, null, [AstFactory.showCombinator2(["A"])]);

- _resolveNode(directive, []);

+ _resolveNode(directive);

_listener.assertNoErrors();

}

@@ -1166,11 +1166,11 @@ class ElementResolverTest extends EngineTestCase {

fail("Not yet tested");

// Need to set up the imported library so that the identifiers can be resolved

String prefixName = "p";

- _definingLibrary.imports = <ImportElement> [ElementFactory.importFor(null, ElementFactory.prefix(prefixName), [])];

+ _definingLibrary.imports = <ImportElement> [ElementFactory.importFor(null, ElementFactory.prefix(prefixName))];

ImportDirective directive = AstFactory.importDirective3(null, prefixName, [

AstFactory.showCombinator2(["A"]),

AstFactory.hideCombinator2(["B"])]);

- _resolveNode(directive, []);

+ _resolveNode(directive);

_listener.assertNoErrors();

}

@@ -1191,23 +1191,23 @@ class ElementResolverTest extends EngineTestCase {

// abstract class A { int operator[](int index); }

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

MethodElement operator = ElementFactory.methodElement("[]", intType, [intType]);

classA.methods = <MethodElement> [operator];

// class B implements A {}

- ClassElementImpl classB = ElementFactory.classElement2("B", []);

+ ClassElementImpl classB = ElementFactory.classElement2("B");

classB.interfaces = <InterfaceType> [classA.type];

// class C extends Object with B {}

- ClassElementImpl classC = ElementFactory.classElement2("C", []);

+ ClassElementImpl classC = ElementFactory.classElement2("C");

classC.mixins = <InterfaceType> [classB.type];

// class D extends C {}

- ClassElementImpl classD = ElementFactory.classElement("D", classC.type, []);

+ ClassElementImpl classD = ElementFactory.classElement("D", classC.type);

// D a;

// a[i];

@@ -1215,7 +1215,7 @@ class ElementResolverTest extends EngineTestCase {

SimpleIdentifier array = AstFactory.identifier3("a");

array.staticType = classD.type;

IndexExpression expression = AstFactory.indexExpression(array, AstFactory.identifier3("i"));

- expect(_resolveIndexExpression(expression, []), same(operator));

+ expect(_resolveIndexExpression(expression), same(operator));

_listener.assertNoErrors();

}

@@ -1224,14 +1224,14 @@ class ElementResolverTest extends EngineTestCase {

SimpleIdentifier leftHandSide = AstFactory.identifier3("a");

leftHandSide.staticType = intType;

AssignmentExpression assignment = AstFactory.assignmentExpression(leftHandSide, TokenType.PLUS_EQ, AstFactory.integer(1));

- _resolveNode(assignment, []);

+ _resolveNode(assignment);

expect(assignment.staticElement, same(getMethod(_typeProvider.numType, "+")));

_listener.assertNoErrors();

}

void test_visitAssignmentExpression_simple() {

AssignmentExpression expression = AstFactory.assignmentExpression(AstFactory.identifier3("x"), TokenType.EQ, AstFactory.integer(0));

- _resolveNode(expression, []);

+ _resolveNode(expression);

expect(expression.staticElement, isNull);

_listener.assertNoErrors();

}

@@ -1244,7 +1244,7 @@ class ElementResolverTest extends EngineTestCase {

SimpleIdentifier left = AstFactory.identifier3("i");

left.staticType = numType;

BinaryExpression expression = AstFactory.binaryExpression(left, TokenType.PLUS, AstFactory.identifier3("j"));

- _resolveNode(expression, []);

+ _resolveNode(expression);

expect(expression.staticElement, getMethod(numType, "+"));

expect(expression.propagatedElement, isNull);

_listener.assertNoErrors();

@@ -1258,7 +1258,7 @@ class ElementResolverTest extends EngineTestCase {

SimpleIdentifier left = AstFactory.identifier3("i");

left.propagatedType = numType;

BinaryExpression expression = AstFactory.binaryExpression(left, TokenType.PLUS, AstFactory.identifier3("j"));

- _resolveNode(expression, []);

+ _resolveNode(expression);

expect(expression.staticElement, isNull);

expect(expression.propagatedElement, getMethod(numType, "+"));

_listener.assertNoErrors();

@@ -1279,23 +1279,23 @@ class ElementResolverTest extends EngineTestCase {

}

void test_visitConstructorName_named() {

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String constructorName = "a";

- ConstructorElement constructor = ElementFactory.constructorElement2(classA, constructorName, []);

+ ConstructorElement constructor = ElementFactory.constructorElement2(classA, constructorName);

classA.constructors = <ConstructorElement> [constructor];

- ConstructorName name = AstFactory.constructorName(AstFactory.typeName(classA, []), constructorName);

- _resolveNode(name, []);

+ ConstructorName name = AstFactory.constructorName(AstFactory.typeName(classA), constructorName);

+ _resolveNode(name);

expect(name.staticElement, same(constructor));

_listener.assertNoErrors();

}

void test_visitConstructorName_unnamed() {

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String constructorName = null;

- ConstructorElement constructor = ElementFactory.constructorElement2(classA, constructorName, []);

+ ConstructorElement constructor = ElementFactory.constructorElement2(classA, constructorName);

classA.constructors = <ConstructorElement> [constructor];

- ConstructorName name = AstFactory.constructorName(AstFactory.typeName(classA, []), constructorName);

- _resolveNode(name, []);

+ ConstructorName name = AstFactory.constructorName(AstFactory.typeName(classA), constructorName);

+ _resolveNode(name);

expect(name.staticElement, same(constructor));

_listener.assertNoErrors();

}

@@ -1315,9 +1315,9 @@ class ElementResolverTest extends EngineTestCase {

}

void test_visitExportDirective_noCombinators() {

- ExportDirective directive = AstFactory.exportDirective2(null, []);

- directive.element = ElementFactory.exportFor(ElementFactory.library(_definingLibrary.context, "lib"), []);

- _resolveNode(directive, []);

+ ExportDirective directive = AstFactory.exportDirective2(null);

+ directive.element = ElementFactory.exportFor(ElementFactory.library(_definingLibrary.context, "lib"));

+ _resolveNode(directive);

_listener.assertNoErrors();

}

@@ -1325,7 +1325,7 @@ class ElementResolverTest extends EngineTestCase {

String fieldName = "f";

InterfaceType intType = _typeProvider.intType;

FieldElementImpl fieldElement = ElementFactory.fieldElement(fieldName, false, false, false, intType);

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

classA.fields = <FieldElement> [fieldElement];

FieldFormalParameter parameter = AstFactory.fieldFormalParameter2(fieldName);

FieldFormalParameterElementImpl parameterElement = ElementFactory.fieldFormalParameter(parameter.identifier);

@@ -1337,19 +1337,19 @@ class ElementResolverTest extends EngineTestCase {

}

void test_visitImportDirective_noCombinators_noPrefix() {

- ImportDirective directive = AstFactory.importDirective3(null, null, []);

- directive.element = ElementFactory.importFor(ElementFactory.library(_definingLibrary.context, "lib"), null, []);

- _resolveNode(directive, []);

+ ImportDirective directive = AstFactory.importDirective3(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), []);

+ ImportElement importElement = ElementFactory.importFor(ElementFactory.library(_definingLibrary.context, "lib"), ElementFactory.prefix(prefixName));

_definingLibrary.imports = <ImportElement> [importElement];

- ImportDirective directive = AstFactory.importDirective3(null, prefixName, []);

+ ImportDirective directive = AstFactory.importDirective3(null, prefixName);

directive.element = importElement;

- _resolveNode(directive, []);

+ _resolveNode(directive);

_listener.assertNoErrors();

}

@@ -1363,8 +1363,8 @@ class ElementResolverTest extends EngineTestCase {

CompilationUnitElementImpl unit = library.definingCompilationUnit as CompilationUnitElementImpl;

unit.accessors = <PropertyAccessorElement> [varA.getter, varA.setter, varB.getter, varC.setter];

unit.topLevelVariables = <TopLevelVariableElement> [varA, varB, varC];

- directive.element = ElementFactory.importFor(library, null, []);

- _resolveNode(directive, []);

+ directive.element = ElementFactory.importFor(library, null);

+ _resolveNode(directive);

expect(combinator.shownNames[0].staticElement, same(varA));

expect(combinator.shownNames[1].staticElement, same(varB));

expect(combinator.shownNames[2].staticElement, same(varC));

@@ -1372,19 +1372,19 @@ class ElementResolverTest extends EngineTestCase {

}

void test_visitIndexExpression_get() {

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ 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"));

- expect(_resolveIndexExpression(expression, []), same(getter));

+ expect(_resolveIndexExpression(expression), same(getter));

_listener.assertNoErrors();

}

void test_visitIndexExpression_set() {

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

InterfaceType intType = _typeProvider.intType;

MethodElement setter = ElementFactory.methodElement("[]=", intType, [intType]);

classA.methods = <MethodElement> [setter];

@@ -1392,48 +1392,48 @@ class ElementResolverTest extends EngineTestCase {

array.staticType = classA.type;

IndexExpression expression = AstFactory.indexExpression(array, AstFactory.identifier3("i"));

AstFactory.assignmentExpression(expression, TokenType.EQ, AstFactory.integer(0));

- expect(_resolveIndexExpression(expression, []), same(setter));

+ expect(_resolveIndexExpression(expression), same(setter));

_listener.assertNoErrors();

}

void test_visitInstanceCreationExpression_named() {

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String constructorName = "a";

- ConstructorElement constructor = ElementFactory.constructorElement2(classA, constructorName, []);

+ ConstructorElement constructor = ElementFactory.constructorElement2(classA, constructorName);

classA.constructors = <ConstructorElement> [constructor];

- ConstructorName name = AstFactory.constructorName(AstFactory.typeName(classA, []), constructorName);

+ ConstructorName name = AstFactory.constructorName(AstFactory.typeName(classA), constructorName);

name.staticElement = constructor;

- InstanceCreationExpression creation = AstFactory.instanceCreationExpression(Keyword.NEW, name, []);

- _resolveNode(creation, []);

+ InstanceCreationExpression creation = AstFactory.instanceCreationExpression(Keyword.NEW, name);

+ _resolveNode(creation);

expect(creation.staticElement, same(constructor));

_listener.assertNoErrors();

}

void test_visitInstanceCreationExpression_unnamed() {

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String constructorName = null;

- ConstructorElement constructor = ElementFactory.constructorElement2(classA, constructorName, []);

+ ConstructorElement constructor = ElementFactory.constructorElement2(classA, constructorName);

classA.constructors = <ConstructorElement> [constructor];

- ConstructorName name = AstFactory.constructorName(AstFactory.typeName(classA, []), constructorName);

+ ConstructorName name = AstFactory.constructorName(AstFactory.typeName(classA), constructorName);

name.staticElement = constructor;

- InstanceCreationExpression creation = AstFactory.instanceCreationExpression(Keyword.NEW, name, []);

- _resolveNode(creation, []);

+ InstanceCreationExpression creation = AstFactory.instanceCreationExpression(Keyword.NEW, name);

+ _resolveNode(creation);

expect(creation.staticElement, same(constructor));

_listener.assertNoErrors();

}

void test_visitInstanceCreationExpression_unnamed_namedParameter() {

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String constructorName = null;

- ConstructorElementImpl constructor = ElementFactory.constructorElement2(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);

+ 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, []);

+ _resolveNode(creation);

expect(creation.staticElement, same(constructor));

expect((creation.argumentList.arguments[0] as NamedExpression).name.label.staticElement, same(parameter));

_listener.assertNoErrors();

@@ -1444,24 +1444,24 @@ class ElementResolverTest extends EngineTestCase {

SimpleIdentifier left = AstFactory.identifier3("i");

left.staticType = numType;

String methodName = "abs";

- MethodInvocation invocation = AstFactory.methodInvocation(left, methodName, []);

- _resolveNode(invocation, []);

+ MethodInvocation invocation = AstFactory.methodInvocation(left, methodName);

+ _resolveNode(invocation);

expect(invocation.methodName.staticElement, same(getMethod(numType, methodName)));

_listener.assertNoErrors();

}

void test_visitMethodInvocation_namedParameter() {

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String methodName = "m";

String parameterName = "p";

- MethodElementImpl method = ElementFactory.methodElement(methodName, null, []);

+ 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, []);

+ _resolveNode(invocation);

expect(invocation.methodName.staticElement, same(method));

expect((invocation.argumentList.arguments[0] as NamedExpression).name.label.staticElement, same(parameter));

_listener.assertNoErrors();

@@ -1472,7 +1472,7 @@ class ElementResolverTest extends EngineTestCase {

SimpleIdentifier operand = AstFactory.identifier3("i");

operand.staticType = numType;

PostfixExpression expression = AstFactory.postfixExpression(operand, TokenType.PLUS_PLUS);

- _resolveNode(expression, []);

+ _resolveNode(expression);

expect(expression.staticElement, getMethod(numType, "+"));

_listener.assertNoErrors();

}

@@ -1485,14 +1485,14 @@ class ElementResolverTest extends EngineTestCase {

target.staticElement = variable;

target.staticType = dynamicType;

PrefixedIdentifier identifier = AstFactory.identifier(target, AstFactory.identifier3("b"));

- _resolveNode(identifier, []);

+ _resolveNode(identifier);

expect(identifier.staticElement, isNull);

expect(identifier.identifier.staticElement, isNull);

_listener.assertNoErrors();

}

void test_visitPrefixedIdentifier_nonDynamic() {

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String getterName = "b";

PropertyAccessorElement getter = ElementFactory.getterElement(getterName, false, _typeProvider.intType);

classA.accessors = <PropertyAccessorElement> [getter];

@@ -1502,14 +1502,14 @@ class ElementResolverTest extends EngineTestCase {

target.staticElement = variable;

target.staticType = classA.type;

PrefixedIdentifier identifier = AstFactory.identifier(target, AstFactory.identifier3(getterName));

- _resolveNode(identifier, []);

+ _resolveNode(identifier);

expect(identifier.staticElement, same(getter));

expect(identifier.identifier.staticElement, same(getter));

_listener.assertNoErrors();

}

void test_visitPrefixedIdentifier_staticClassMember_getter() {

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

// set accessors

String propName = "b";

PropertyAccessorElement getter = ElementFactory.getterElement(propName, false, _typeProvider.intType);

@@ -1521,20 +1521,20 @@ class ElementResolverTest extends EngineTestCase {

target.staticType = classA.type;

PrefixedIdentifier identifier = AstFactory.identifier(target, AstFactory.identifier3(propName));

// resolve

- _resolveNode(identifier, []);

+ _resolveNode(identifier);

expect(identifier.staticElement, same(getter));

expect(identifier.identifier.staticElement, same(getter));

_listener.assertNoErrors();

}

void test_visitPrefixedIdentifier_staticClassMember_method() {

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

// set accessors

String propName = "m";

PropertyAccessorElement setter = ElementFactory.setterElement(propName, false, _typeProvider.intType);

classA.accessors = <PropertyAccessorElement> [setter];

// set methods

- MethodElement method = ElementFactory.methodElement("m", _typeProvider.intType, []);

+ MethodElement method = ElementFactory.methodElement("m", _typeProvider.intType);

classA.methods = <MethodElement> [method];

// prepare "A.m"

SimpleIdentifier target = AstFactory.identifier3("A");

@@ -1543,14 +1543,14 @@ class ElementResolverTest extends EngineTestCase {

PrefixedIdentifier identifier = AstFactory.identifier(target, AstFactory.identifier3(propName));

AstFactory.assignmentExpression(identifier, TokenType.EQ, AstFactory.nullLiteral());

// resolve

- _resolveNode(identifier, []);

+ _resolveNode(identifier);

expect(identifier.staticElement, same(method));

expect(identifier.identifier.staticElement, same(method));

_listener.assertNoErrors();

}

void test_visitPrefixedIdentifier_staticClassMember_setter() {

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

// set accessors

String propName = "b";

PropertyAccessorElement getter = ElementFactory.getterElement(propName, false, _typeProvider.intType);

@@ -1563,7 +1563,7 @@ class ElementResolverTest extends EngineTestCase {

PrefixedIdentifier identifier = AstFactory.identifier(target, AstFactory.identifier3(propName));

AstFactory.assignmentExpression(identifier, TokenType.EQ, AstFactory.nullLiteral());

// resolve

- _resolveNode(identifier, []);

+ _resolveNode(identifier);

expect(identifier.staticElement, same(setter));

expect(identifier.identifier.staticElement, same(setter));

_listener.assertNoErrors();

@@ -1574,20 +1574,20 @@ class ElementResolverTest extends EngineTestCase {

SimpleIdentifier operand = AstFactory.identifier3("i");

operand.staticType = numType;

PrefixExpression expression = AstFactory.prefixExpression(TokenType.PLUS_PLUS, operand);

- _resolveNode(expression, []);

+ _resolveNode(expression);

expect(expression.staticElement, getMethod(numType, "+"));

_listener.assertNoErrors();

}

void test_visitPropertyAccess_getter_identifier() {

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ 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, []);

+ _resolveNode(access);

expect(access.propertyName.staticElement, same(getter));

_listener.assertNoErrors();

}

@@ -1601,21 +1601,21 @@ class ElementResolverTest extends EngineTestCase {

// ... super.m ...

// }

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ 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;

+ 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, []);

+ AstFactory.methodDeclaration2(null, null, null, null, AstFactory.identifier3("m"), AstFactory.formalParameterList(), AstFactory.expressionFunctionBody(access));

+ _resolveNode(access);

expect(access.propertyName.staticElement, same(getter));

_listener.assertNoErrors();

}

void test_visitPropertyAccess_setter_this() {

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String setterName = "b";

PropertyAccessorElement setter = ElementFactory.setterElement(setterName, false, _typeProvider.intType);

classA.accessors = <PropertyAccessorElement> [setter];

@@ -1623,7 +1623,7 @@ class ElementResolverTest extends EngineTestCase {

target.staticType = classA.type;

PropertyAccess access = AstFactory.propertyAccess2(target, setterName);

AstFactory.assignmentExpression(access, TokenType.EQ, AstFactory.integer(0));

- _resolveNode(access, []);

+ _resolveNode(access);

expect(access.propertyName.staticElement, same(setter));

_listener.assertNoErrors();

}

@@ -1639,7 +1639,7 @@ class ElementResolverTest extends EngineTestCase {

void test_visitSimpleIdentifier_dynamic() {

SimpleIdentifier node = AstFactory.identifier3("dynamic");

- _resolveIdentifier(node, []);

+ _resolveIdentifier(node);

expect(node.staticElement, same(_typeProvider.dynamicType.element));

expect(node.staticType, same(_typeProvider.typeType));

_listener.assertNoErrors();

@@ -1654,7 +1654,7 @@ class ElementResolverTest extends EngineTestCase {

void test_visitSimpleIdentifier_lexicalScope_field_setter() {

InterfaceType intType = _typeProvider.intType;

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String fieldName = "a";

FieldElement field = ElementFactory.fieldElement(fieldName, false, false, false, intType);

classA.fields = <FieldElement> [field];

@@ -1669,27 +1669,27 @@ class ElementResolverTest extends EngineTestCase {

}

void test_visitSuperConstructorInvocation() {

- ClassElementImpl superclass = ElementFactory.classElement2("A", []);

- ConstructorElementImpl superConstructor = ElementFactory.constructorElement2(superclass, null, []);

+ ClassElementImpl superclass = ElementFactory.classElement2("A");

+ ConstructorElementImpl superConstructor = ElementFactory.constructorElement2(superclass, null);

superclass.constructors = <ConstructorElement> [superConstructor];

- ClassElementImpl subclass = ElementFactory.classElement("B", superclass.type, []);

- ConstructorElementImpl subConstructor = ElementFactory.constructorElement2(subclass, null, []);

+ ClassElementImpl subclass = ElementFactory.classElement("B", superclass.type);

+ ConstructorElementImpl subConstructor = ElementFactory.constructorElement2(subclass, null);

subclass.constructors = <ConstructorElement> [subConstructor];

- SuperConstructorInvocation invocation = AstFactory.superConstructorInvocation([]);

+ SuperConstructorInvocation invocation = AstFactory.superConstructorInvocation();

_resolveInClass(invocation, subclass);

expect(invocation.staticElement, superConstructor);

_listener.assertNoErrors();

}

void test_visitSuperConstructorInvocation_namedParameter() {

- ClassElementImpl superclass = ElementFactory.classElement2("A", []);

- ConstructorElementImpl superConstructor = ElementFactory.constructorElement2(superclass, null, []);

+ ClassElementImpl superclass = ElementFactory.classElement2("A");

+ 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.constructorElement2(subclass, null, []);

+ ClassElementImpl subclass = ElementFactory.classElement("B", superclass.type);

+ ConstructorElementImpl subConstructor = ElementFactory.constructorElement2(subclass, null);

subclass.constructors = <ConstructorElement> [subConstructor];

SuperConstructorInvocation invocation = AstFactory.superConstructorInvocation([AstFactory.namedExpression2(parameterName, AstFactory.integer(0))]);

_resolveInClass(invocation, subclass);

@@ -1757,7 +1757,7 @@ class ElementResolverTest extends EngineTestCase {

* being resolved

* @return the element to which the expression was resolved

- Element _resolveIdentifier(Identifier node, List<Element> definedElements) {

+ Element _resolveIdentifier(Identifier node, [List<Element> definedElements]) {

_resolveNode(node, definedElements);

return node.staticElement;

}

@@ -1796,7 +1796,7 @@ class ElementResolverTest extends EngineTestCase {

* being resolved

* @return the element to which the expression was resolved

- Element _resolveIndexExpression(IndexExpression node, List<Element> definedElements) {

+ Element _resolveIndexExpression(IndexExpression node, [List<Element> definedElements]) {

_resolveNode(node, definedElements);

return node.staticElement;

}

@@ -1810,13 +1810,15 @@ class ElementResolverTest extends EngineTestCase {

* being resolved

* @return the element to which the expression was resolved

- void _resolveNode(AstNode node, List<Element> definedElements) {

+ void _resolveNode(AstNode node, [List<Element> definedElements]) {

try {

Scope outerScope = _visitor.nameScope_J2DAccessor as Scope;

try {

EnclosedScope innerScope = new EnclosedScope(outerScope);

- for (Element element in definedElements) {

- innerScope.define(element);

+ if (definedElements != null) {

+ for (Element element in definedElements) {

+ innerScope.define(element);

+ }

}

_visitor.nameScope_J2DAccessor = innerScope;

node.accept(_resolver);

@@ -3263,7 +3265,7 @@ main() {

}

print(x) {}''');

resolve(source);

- assertErrors(source, []);

+ assertErrors(source);

verify([source]);

}

@@ -3279,7 +3281,7 @@ main() {

}

''');

resolve(source);

- assertErrors(source, []);

+ assertErrors(source);

verify([source]);

}

@@ -3292,7 +3294,7 @@ main() {

foo();

}''');

resolve(source);

- assertErrors(source, []);

+ assertErrors(source);

verify([source]);

}

@@ -3305,7 +3307,7 @@ main() {

}

}''');

resolve(source);

- assertErrors(source, []);

+ assertErrors(source);

verify([source]);

}

@@ -3333,7 +3335,7 @@ main() {

}

print(x) {}''');

resolve(source);

- assertErrors(source, []);

+ assertErrors(source);

verify([source]);

}

@@ -3483,11 +3485,11 @@ class InheritanceManagerTest extends EngineTestCase {

void test_getMapOfMembersInheritedFromClasses_accessor_extends() {

// class A { int get g; }

// class B extends A {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ 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, []);

+ ClassElementImpl classB = ElementFactory.classElement("B", classA.type);

MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);

expect(mapA.size, _numOfMembersInObject);

@@ -3500,11 +3502,11 @@ class InheritanceManagerTest extends EngineTestCase {

void test_getMapOfMembersInheritedFromClasses_accessor_implements() {

// class A { int get g; }

// class B implements A {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ 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", []);

+ ClassElementImpl classB = ElementFactory.classElement2("B");

classB.interfaces = <InterfaceType> [classA.type];

MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);

@@ -3518,11 +3520,11 @@ class InheritanceManagerTest extends EngineTestCase {

void test_getMapOfMembersInheritedFromClasses_accessor_with() {

// class A { int get g; }

// class B extends Object with A {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ 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", []);

+ ClassElementImpl classB = ElementFactory.classElement2("B");

classB.mixins = <InterfaceType> [classA.type];

MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);

@@ -3535,7 +3537,7 @@ class InheritanceManagerTest extends EngineTestCase {

void test_getMapOfMembersInheritedFromClasses_implicitExtends() {

// class A {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);

expect(mapA.size, _numOfMembersInObject);

_assertNoErrors(classA);

@@ -3544,11 +3546,11 @@ class InheritanceManagerTest extends EngineTestCase {

void test_getMapOfMembersInheritedFromClasses_method_extends() {

// class A { int g(); }

// class B extends A {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String methodName = "m";

- MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);

+ MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType);

classA.methods = <MethodElement> [methodM];

- ClassElementImpl classB = ElementFactory.classElement2("B", []);

+ ClassElementImpl classB = ElementFactory.classElement2("B");

classB.supertype = classA.type;

MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);

@@ -3562,11 +3564,11 @@ class InheritanceManagerTest extends EngineTestCase {

void test_getMapOfMembersInheritedFromClasses_method_implements() {

// class A { int g(); }

// class B implements A {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String methodName = "m";

- MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);

+ MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType);

classA.methods = <MethodElement> [methodM];

- ClassElementImpl classB = ElementFactory.classElement2("B", []);

+ ClassElementImpl classB = ElementFactory.classElement2("B");

classB.interfaces = <InterfaceType> [classA.type];

MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);

@@ -3580,11 +3582,11 @@ class InheritanceManagerTest extends EngineTestCase {

void test_getMapOfMembersInheritedFromClasses_method_with() {

// class A { int g(); }

// class B extends Object with A {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String methodName = "m";

- MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);

+ MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType);

classA.methods = <MethodElement> [methodM];

- ClassElementImpl classB = ElementFactory.classElement2("B", []);

+ ClassElementImpl classB = ElementFactory.classElement2("B");

classB.mixins = <InterfaceType> [classA.type];

MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);

@@ -3598,11 +3600,11 @@ class InheritanceManagerTest extends EngineTestCase {

void test_getMapOfMembersInheritedFromInterfaces_accessor_extends() {

// class A { int get g; }

// class B extends A {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ 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, []);

+ ClassElementImpl classB = ElementFactory.classElement("B", classA.type);

MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

expect(mapA.size, _numOfMembersInObject);

@@ -3615,11 +3617,11 @@ class InheritanceManagerTest extends EngineTestCase {

void test_getMapOfMembersInheritedFromInterfaces_accessor_implements() {

// class A { int get g; }

// class B implements A {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ 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", []);

+ ClassElementImpl classB = ElementFactory.classElement2("B");

classB.interfaces = <InterfaceType> [classA.type];

MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

@@ -3633,11 +3635,11 @@ class InheritanceManagerTest extends EngineTestCase {

void test_getMapOfMembersInheritedFromInterfaces_accessor_with() {

// class A { int get g; }

// class B extends Object with A {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ 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", []);

+ ClassElementImpl classB = ElementFactory.classElement2("B");

classB.mixins = <InterfaceType> [classA.type];

MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

@@ -3650,7 +3652,7 @@ class InheritanceManagerTest extends EngineTestCase {

void test_getMapOfMembersInheritedFromInterfaces_implicitExtends() {

// class A {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

expect(mapA.size, _numOfMembersInObject);

_assertNoErrors(classA);

@@ -3660,14 +3662,14 @@ class InheritanceManagerTest extends EngineTestCase {

// class I1 { int m(); }

// class I2 { int get m; }

// class A implements I2, I1 {}

- ClassElementImpl classI1 = ElementFactory.classElement2("I1", []);

+ ClassElementImpl classI1 = ElementFactory.classElement2("I1");

String methodName = "m";

- MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);

+ MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType);

classI1.methods = <MethodElement> [methodM];

- ClassElementImpl classI2 = ElementFactory.classElement2("I2", []);

+ ClassElementImpl classI2 = ElementFactory.classElement2("I2");

PropertyAccessorElement getter = ElementFactory.getterElement(methodName, false, _typeProvider.intType);

classI2.accessors = <PropertyAccessorElement> [getter];

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

classA.interfaces = <InterfaceType> [classI2.type, classI1.type];

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

expect(mapA.size, _numOfMembersInObject);

@@ -3679,14 +3681,14 @@ class InheritanceManagerTest extends EngineTestCase {

// class I1 { int m(); }

// class I2 { String m(); }

// class A implements I1, I2 {}

- ClassElementImpl classI1 = ElementFactory.classElement2("I1", []);

+ 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", []);

+ ClassElementImpl classI2 = ElementFactory.classElement2("I2");

MethodElement methodM2 = ElementFactory.methodElement(methodName, null, [_typeProvider.stringType]);

classI2.methods = <MethodElement> [methodM2];

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

classA.interfaces = <InterfaceType> [classI1.type, classI2.type];

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

expect(mapA.size, _numOfMembersInObject);

@@ -3698,14 +3700,14 @@ class InheritanceManagerTest extends EngineTestCase {

// class I1 { int m(); }

// class I2 { int get m; }

// class A implements I1, I2 {}

- ClassElementImpl classI1 = ElementFactory.classElement2("I1", []);

+ ClassElementImpl classI1 = ElementFactory.classElement2("I1");

String methodName = "m";

- MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);

+ MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType);

classI1.methods = <MethodElement> [methodM];

- ClassElementImpl classI2 = ElementFactory.classElement2("I2", []);

+ ClassElementImpl classI2 = ElementFactory.classElement2("I2");

PropertyAccessorElement getter = ElementFactory.getterElement(methodName, false, _typeProvider.intType);

classI2.accessors = <PropertyAccessorElement> [getter];

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

classA.interfaces = <InterfaceType> [classI1.type, classI2.type];

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

expect(mapA.size, _numOfMembersInObject);

@@ -3717,9 +3719,9 @@ class InheritanceManagerTest extends EngineTestCase {

// class I1 { dynamic m(int, [int]); }

// class I2 { dynamic m(int, int, int); }

// class A implements I1, I2 {}

- ClassElementImpl classI1 = ElementFactory.classElement2("I1", []);

+ ClassElementImpl classI1 = ElementFactory.classElement2("I1");

String methodName = "m";

- MethodElementImpl methodM1 = ElementFactory.methodElement(methodName, _typeProvider.dynamicType, []);

+ MethodElementImpl methodM1 = ElementFactory.methodElement(methodName, _typeProvider.dynamicType);

ParameterElementImpl parameter1 = new ParameterElementImpl.forNode(AstFactory.identifier3("a1"));

parameter1.type = _typeProvider.intType;

parameter1.parameterKind = ParameterKind.REQUIRED;

@@ -3728,8 +3730,8 @@ class InheritanceManagerTest extends EngineTestCase {

parameter2.parameterKind = ParameterKind.POSITIONAL;

methodM1.parameters = <ParameterElement> [parameter1, parameter2];

classI1.methods = <MethodElement> [methodM1];

- ClassElementImpl classI2 = ElementFactory.classElement2("I2", []);

- MethodElementImpl methodM2 = ElementFactory.methodElement(methodName, _typeProvider.dynamicType, []);

+ ClassElementImpl classI2 = ElementFactory.classElement2("I2");

+ MethodElementImpl methodM2 = ElementFactory.methodElement(methodName, _typeProvider.dynamicType);

ParameterElementImpl parameter3 = new ParameterElementImpl.forNode(AstFactory.identifier3("a3"));

parameter3.type = _typeProvider.intType;

parameter3.parameterKind = ParameterKind.REQUIRED;

@@ -3741,7 +3743,7 @@ class InheritanceManagerTest extends EngineTestCase {

parameter5.parameterKind = ParameterKind.REQUIRED;

methodM2.parameters = <ParameterElement> [parameter3, parameter4, parameter5];

classI2.methods = <MethodElement> [methodM2];

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

classA.interfaces = <InterfaceType> [classI1.type, classI2.type];

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

expect(mapA.size, _numOfMembersInObject);

@@ -3753,14 +3755,14 @@ class InheritanceManagerTest extends EngineTestCase {

// class I1 { int m(); }

// class I2 { String m(); }

// class A implements I2, I1 {}

- ClassElementImpl classI1 = ElementFactory.classElement2("I1", []);

+ ClassElementImpl classI1 = ElementFactory.classElement2("I1");

String methodName = "m";

MethodElement methodM1 = ElementFactory.methodElement(methodName, null, [_typeProvider.stringType]);

classI1.methods = <MethodElement> [methodM1];

- ClassElementImpl classI2 = ElementFactory.classElement2("I2", []);

+ ClassElementImpl classI2 = ElementFactory.classElement2("I2");

MethodElement methodM2 = ElementFactory.methodElement(methodName, null, [_typeProvider.intType]);

classI2.methods = <MethodElement> [methodM2];

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

classA.interfaces = <InterfaceType> [classI2.type, classI1.type];

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

expect(mapA.size, _numOfMembersInObject);

@@ -3771,11 +3773,11 @@ class InheritanceManagerTest extends EngineTestCase {

void test_getMapOfMembersInheritedFromInterfaces_method_extends() {

// class A { int g(); }

// class B extends A {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String methodName = "m";

- MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);

+ MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType);

classA.methods = <MethodElement> [methodM];

- ClassElementImpl classB = ElementFactory.classElement("B", classA.type, []);

+ ClassElementImpl classB = ElementFactory.classElement("B", classA.type);

MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

expect(mapA.size, _numOfMembersInObject);

@@ -3788,11 +3790,11 @@ class InheritanceManagerTest extends EngineTestCase {

void test_getMapOfMembersInheritedFromInterfaces_method_implements() {

// class A { int g(); }

// class B implements A {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String methodName = "m";

- MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);

+ MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType);

classA.methods = <MethodElement> [methodM];

- ClassElementImpl classB = ElementFactory.classElement2("B", []);

+ ClassElementImpl classB = ElementFactory.classElement2("B");

classB.interfaces = <InterfaceType> [classA.type];

MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

@@ -3806,11 +3808,11 @@ class InheritanceManagerTest extends EngineTestCase {

void test_getMapOfMembersInheritedFromInterfaces_method_with() {

// class A { int g(); }

// class B extends Object with A {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

String methodName = "m";

- MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType, []);

+ MethodElement methodM = ElementFactory.methodElement(methodName, _typeProvider.intType);

classA.methods = <MethodElement> [methodM];

- ClassElementImpl classB = ElementFactory.classElement2("B", []);

+ ClassElementImpl classB = ElementFactory.classElement2("B");

classB.mixins = <InterfaceType> [classA.type];

MemberMap mapB = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

@@ -3825,15 +3827,15 @@ class InheritanceManagerTest extends EngineTestCase {

// class I1 { int m1(); }

// class I2 { int m2(); }

// class A implements I1, I2 {}

- ClassElementImpl classI1 = ElementFactory.classElement2("I1", []);

+ ClassElementImpl classI1 = ElementFactory.classElement2("I1");

String methodName1 = "m1";

- MethodElement methodM1 = ElementFactory.methodElement(methodName1, _typeProvider.intType, []);

+ MethodElement methodM1 = ElementFactory.methodElement(methodName1, _typeProvider.intType);

classI1.methods = <MethodElement> [methodM1];

- ClassElementImpl classI2 = ElementFactory.classElement2("I2", []);

+ ClassElementImpl classI2 = ElementFactory.classElement2("I2");

String methodName2 = "m2";

- MethodElement methodM2 = ElementFactory.methodElement(methodName2, _typeProvider.intType, []);

+ MethodElement methodM2 = ElementFactory.methodElement(methodName2, _typeProvider.intType);

classI2.methods = <MethodElement> [methodM2];

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

classA.interfaces = <InterfaceType> [classI1.type, classI2.type];

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

expect(mapA.size, _numOfMembersInObject + 2);

@@ -3846,14 +3848,14 @@ class InheritanceManagerTest extends EngineTestCase {

// class I1 { int get g; }

// class I2 { num get g; }

// class A implements I1, I2 {}

- ClassElementImpl classI1 = ElementFactory.classElement2("I1", []);

+ ClassElementImpl classI1 = ElementFactory.classElement2("I1");

String accessorName = "g";

PropertyAccessorElement getter1 = ElementFactory.getterElement(accessorName, false, _typeProvider.intType);

classI1.accessors = <PropertyAccessorElement> [getter1];

- ClassElementImpl classI2 = ElementFactory.classElement2("I2", []);

+ ClassElementImpl classI2 = ElementFactory.classElement2("I2");

PropertyAccessorElement getter2 = ElementFactory.getterElement(accessorName, false, _typeProvider.numType);

classI2.accessors = <PropertyAccessorElement> [getter2];

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

classA.interfaces = <InterfaceType> [classI1.type, classI2.type];

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

expect(mapA.size, _numOfMembersInObject + 1);

@@ -3866,22 +3868,22 @@ class InheritanceManagerTest extends EngineTestCase {

// class I1 { dynamic m(int); }

// class I2 { dynamic m(num); }

// class A implements I1, I2 {}

- ClassElementImpl classI1 = ElementFactory.classElement2("I1", []);

+ ClassElementImpl classI1 = ElementFactory.classElement2("I1");

String methodName = "m";

- MethodElementImpl methodM1 = ElementFactory.methodElement(methodName, _typeProvider.dynamicType, []);

+ MethodElementImpl methodM1 = ElementFactory.methodElement(methodName, _typeProvider.dynamicType);

ParameterElementImpl parameter1 = new ParameterElementImpl.forNode(AstFactory.identifier3("a0"));

parameter1.type = _typeProvider.intType;

parameter1.parameterKind = ParameterKind.REQUIRED;

methodM1.parameters = <ParameterElement> [parameter1];

classI1.methods = <MethodElement> [methodM1];

- ClassElementImpl classI2 = ElementFactory.classElement2("I2", []);

- MethodElementImpl methodM2 = ElementFactory.methodElement(methodName, _typeProvider.dynamicType, []);

+ ClassElementImpl classI2 = ElementFactory.classElement2("I2");

+ MethodElementImpl methodM2 = ElementFactory.methodElement(methodName, _typeProvider.dynamicType);

ParameterElementImpl parameter2 = new ParameterElementImpl.forNode(AstFactory.identifier3("a0"));

parameter2.type = _typeProvider.numType;

parameter2.parameterKind = ParameterKind.REQUIRED;

methodM2.parameters = <ParameterElement> [parameter2];

classI2.methods = <MethodElement> [methodM2];

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

classA.interfaces = <InterfaceType> [classI1.type, classI2.type];

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

expect(mapA.size, _numOfMembersInObject + 1);

@@ -3894,14 +3896,14 @@ class InheritanceManagerTest extends EngineTestCase {

// class I1 { set s(int); }

// class I2 { set s(num); }

// class A implements I1, I2 {}

- ClassElementImpl classI1 = ElementFactory.classElement2("I1", []);

+ ClassElementImpl classI1 = ElementFactory.classElement2("I1");

String accessorName = "s";

PropertyAccessorElement setter1 = ElementFactory.setterElement(accessorName, false, _typeProvider.intType);

classI1.accessors = <PropertyAccessorElement> [setter1];

- ClassElementImpl classI2 = ElementFactory.classElement2("I2", []);

+ ClassElementImpl classI2 = ElementFactory.classElement2("I2");

PropertyAccessorElement setter2 = ElementFactory.setterElement(accessorName, false, _typeProvider.numType);

classI2.accessors = <PropertyAccessorElement> [setter2];

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

classA.interfaces = <InterfaceType> [classI1.type, classI2.type];

MemberMap mapA = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);

expect(mapA.size, _numOfMembersInObject + 1);

@@ -3919,20 +3921,20 @@ class InheritanceManagerTest extends EngineTestCase {

// class I2 { B get g; }

// class I3 { C get g; }

// class D implements I1, I2, I3 {}

- ClassElementImpl classA = ElementFactory.classElement2("A", []);

- ClassElementImpl classB = ElementFactory.classElement("B", classA.type, []);

- ClassElementImpl classC = ElementFactory.classElement("C", classB.type, []);

- ClassElementImpl classI1 = ElementFactory.classElement2("I1", []);

+ ClassElementImpl classA = ElementFactory.classElement2("A");

+ ClassElementImpl classB = ElementFactory.classElement("B", classA.type);

+ ClassElementImpl classC = ElementFactory.classElement("C", classB.type);

+ ClassElementImpl classI1 = ElementFactory.classElement2("I1");

String accessorName = "g";

PropertyAccessorElement getter1 = ElementFactory.getterElement(accessorName, false, classA.type);

classI1.accessors = <PropertyAccessorElement> [getter1];

- ClassElementImpl classI2 = ElementFactory.classElement2("I2", []);

+ ClassElementImpl classI2 = ElementFactory.classElement2("I2");

PropertyAccessorElement getter2 = ElementFactory.getterElement(accessorName, false, classB.type);

classI2.accessors = <PropertyAccessorElement> [getter2];

- ClassElementImpl classI3 = ElementFactory.classElement2("I3", []);

+ ClassElementImpl classI3 = ElementFactory.classElement2("I3");

PropertyAccessorElement getter3 = ElementFactory.getterElement(accessorName, false, classC.type);

classI3.accessors = <PropertyAccessorElement> [getter3];

- ClassElementImpl classD = ElementFactory.classElement2("D", []);

+ ClassElementImpl classD = ElementFactory.classElement2("D");

classD.interfaces = <InterfaceType> [classI1.type, classI2.type, classI3.type];

MemberMap mapD = _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classD);

expect(mapD.size, _numOfMembersInObject + 1);

@@ -3949,32 +3951,32 @@ class InheritanceManagerTest extends EngineTestCase {

// class I2 { dynamic m(B b); }

// class I3 { dynamic m(C c); }