| Index: pkg/analyzer/lib/src/generated/testing/element_factory.dart
|
| diff --git a/pkg/analyzer/lib/src/generated/testing/element_factory.dart b/pkg/analyzer/lib/src/generated/testing/element_factory.dart
|
| index 497990c91cd366320bc04c0cd58673c8aa18c400..7c57bde0fd9828b03c97c3a15a7e0054d51b6006 100644
|
| --- a/pkg/analyzer/lib/src/generated/testing/element_factory.dart
|
| +++ b/pkg/analyzer/lib/src/generated/testing/element_factory.dart
|
| @@ -43,7 +43,7 @@ class ElementFactory {
|
| [List<String> parameterNames]) {
|
| ClassElementImpl element = new ClassElementImpl(typeName, 0);
|
| element.supertype = superclassType;
|
| - InterfaceTypeImpl type = new InterfaceTypeImpl.con1(element);
|
| + InterfaceTypeImpl type = new InterfaceTypeImpl(element);
|
| element.type = type;
|
| if (parameterNames != null) {
|
| int count = parameterNames.length;
|
| @@ -114,7 +114,7 @@ class ElementFactory {
|
| constructor.parameters = <ParameterElement>[];
|
| }
|
| constructor.returnType = type;
|
| - FunctionTypeImpl constructorType = new FunctionTypeImpl.con1(constructor);
|
| + FunctionTypeImpl constructorType = new FunctionTypeImpl(constructor);
|
| constructor.type = constructorType;
|
| return constructor;
|
| }
|
| @@ -131,7 +131,7 @@ class ElementFactory {
|
| // Build the enum.
|
| //
|
| ClassElementImpl enumElement = new ClassElementImpl(enumName, -1);
|
| - InterfaceTypeImpl enumType = new InterfaceTypeImpl.con1(enumElement);
|
| + InterfaceTypeImpl enumType = new InterfaceTypeImpl(enumElement);
|
| enumElement.type = enumType;
|
| enumElement.supertype = objectType;
|
| enumElement.enum2 = true;
|
| @@ -164,7 +164,7 @@ class ElementFactory {
|
| for (int i = 0; i < constantCount; i++) {
|
| String constantName = constantNames[i];
|
| FieldElementImpl constantElement =
|
| - new ConstFieldElementImpl.con2(constantName, -1);
|
| + new ConstFieldElementImpl(constantName, -1);
|
| constantElement.static = true;
|
| constantElement.const3 = true;
|
| constantElement.type = enumType;
|
| @@ -175,7 +175,7 @@ class ElementFactory {
|
| new DartObjectImpl(stringType, new StringState(constantName));
|
| DartObjectImpl value =
|
| new DartObjectImpl(enumType, new GenericState(fieldMap));
|
| - constantElement.evaluationResult = new EvaluationResultImpl.con1(value);
|
| + constantElement.evaluationResult = new EvaluationResultImpl(value);
|
| fields.add(constantElement);
|
| }
|
| }
|
| @@ -209,7 +209,7 @@ class ElementFactory {
|
| getter.variable = field;
|
| getter.returnType = type;
|
| field.getter = getter;
|
| - FunctionTypeImpl getterType = new FunctionTypeImpl.con1(getter);
|
| + FunctionTypeImpl getterType = new FunctionTypeImpl(getter);
|
| getter.type = getterType;
|
| if (!isConst && !isFinal) {
|
| PropertyAccessorElementImpl setter =
|
| @@ -220,7 +220,7 @@ class ElementFactory {
|
| setter.parameters =
|
| <ParameterElement>[requiredParameter2("_$name", type)];
|
| setter.returnType = VoidTypeImpl.instance;
|
| - setter.type = new FunctionTypeImpl.con1(setter);
|
| + setter.type = new FunctionTypeImpl(setter);
|
| field.setter = setter;
|
| }
|
| return field;
|
| @@ -242,7 +242,7 @@ class ElementFactory {
|
| // We don't create parameter elements because we don't have parameter names
|
| FunctionElementImpl functionElement =
|
| new FunctionElementImpl(functionName, 0);
|
| - FunctionTypeImpl functionType = new FunctionTypeImpl.con1(functionElement);
|
| + FunctionTypeImpl functionType = new FunctionTypeImpl(functionElement);
|
| functionElement.type = functionType;
|
| // return type
|
| if (returnElement == null) {
|
| @@ -277,7 +277,7 @@ class ElementFactory {
|
| List<String> names, List<ClassElement> namedParameters) {
|
| FunctionElementImpl functionElement =
|
| new FunctionElementImpl(functionName, 0);
|
| - FunctionTypeImpl functionType = new FunctionTypeImpl.con1(functionElement);
|
| + FunctionTypeImpl functionType = new FunctionTypeImpl(functionElement);
|
| functionElement.type = functionType;
|
| // parameters
|
| int normalCount = normalParameters == null ? 0 : normalParameters.length;
|
| @@ -334,7 +334,7 @@ class ElementFactory {
|
| functionElement.returnType =
|
| returnType == null ? VoidTypeImpl.instance : returnType;
|
| functionElement.parameters = parameters;
|
| - FunctionTypeImpl functionType = new FunctionTypeImpl.con1(functionElement);
|
| + FunctionTypeImpl functionType = new FunctionTypeImpl(functionElement);
|
| functionElement.type = functionType;
|
| return functionElement;
|
| }
|
| @@ -351,7 +351,7 @@ class ElementFactory {
|
| getter.variable = field;
|
| getter.returnType = type;
|
| field.getter = getter;
|
| - FunctionTypeImpl getterType = new FunctionTypeImpl.con1(getter);
|
| + FunctionTypeImpl getterType = new FunctionTypeImpl(getter);
|
| getter.type = getterType;
|
| return getter;
|
| }
|
| @@ -406,7 +406,7 @@ class ElementFactory {
|
| method.parameters = parameters;
|
| }
|
| method.returnType = returnType;
|
| - FunctionTypeImpl methodType = new FunctionTypeImpl.con1(method);
|
| + FunctionTypeImpl methodType = new FunctionTypeImpl(method);
|
| method.type = methodType;
|
| return method;
|
| }
|
| @@ -417,7 +417,7 @@ class ElementFactory {
|
| MethodElementImpl method = new MethodElementImpl(methodName, 0);
|
| method.parameters = parameters;
|
| method.returnType = returnType;
|
| - FunctionTypeImpl methodType = new FunctionTypeImpl.con1(method);
|
| + FunctionTypeImpl methodType = new FunctionTypeImpl(method);
|
| methodType.typeArguments = typeArguments;
|
| method.type = methodType;
|
| return method;
|
| @@ -477,7 +477,7 @@ class ElementFactory {
|
| getter.variable = field;
|
| getter.returnType = type;
|
| field.getter = getter;
|
| - FunctionTypeImpl getterType = new FunctionTypeImpl.con1(getter);
|
| + FunctionTypeImpl getterType = new FunctionTypeImpl(getter);
|
| getter.type = getterType;
|
| ParameterElementImpl parameter = requiredParameter2("a", type);
|
| PropertyAccessorElementImpl setter =
|
| @@ -487,7 +487,7 @@ class ElementFactory {
|
| setter.variable = field;
|
| setter.parameters = <ParameterElement>[parameter];
|
| setter.returnType = VoidTypeImpl.instance;
|
| - setter.type = new FunctionTypeImpl.con1(setter);
|
| + setter.type = new FunctionTypeImpl(setter);
|
| field.setter = setter;
|
| return setter;
|
| }
|
| @@ -512,7 +512,7 @@ class ElementFactory {
|
| getter.variable = variable;
|
| getter.returnType = type;
|
| variable.getter = getter;
|
| - FunctionTypeImpl getterType = new FunctionTypeImpl.con1(getter);
|
| + FunctionTypeImpl getterType = new FunctionTypeImpl(getter);
|
| getter.type = getterType;
|
| if (!isConst && !isFinal) {
|
| PropertyAccessorElementImpl setter =
|
| @@ -524,7 +524,7 @@ class ElementFactory {
|
| setter.parameters =
|
| <ParameterElement>[requiredParameter2("_$name", type)];
|
| setter.returnType = VoidTypeImpl.instance;
|
| - setter.type = new FunctionTypeImpl.con1(setter);
|
| + setter.type = new FunctionTypeImpl(setter);
|
| variable.setter = setter;
|
| }
|
| return variable;
|
|
|