| Index: pkg/analyzer/test/generated/analysis_context_factory.dart
|
| diff --git a/pkg/analyzer/test/generated/analysis_context_factory.dart b/pkg/analyzer/test/generated/analysis_context_factory.dart
|
| index ad6f41875e5ee4aed3021571022ad4323ba56737..04560c2f4115606e3d3bfd2fc3e0148ffb58c0e2 100644
|
| --- a/pkg/analyzer/test/generated/analysis_context_factory.dart
|
| +++ b/pkg/analyzer/test/generated/analysis_context_factory.dart
|
| @@ -93,7 +93,7 @@ class AnalysisContextFactory {
|
| //
|
| TestTypeProvider provider = new TestTypeProvider();
|
| CompilationUnitElementImpl coreUnit =
|
| - new CompilationUnitElementImpl("core.dart");
|
| + new CompilationUnitElementImpl("core.dart");
|
| Source coreSource = sourceFactory.forUri(DartSdk.DART_CORE);
|
| coreContext.setContents(coreSource, "");
|
| coreUnit.librarySource = coreUnit.source = coreSource;
|
| @@ -132,15 +132,15 @@ class AnalysisContextFactory {
|
| TopLevelVariableElement proxyTopLevelVariableElt = ElementFactory
|
| .topLevelVariableElement3("proxy", true, false, proxyClassElement.type);
|
| ConstTopLevelVariableElementImpl deprecatedTopLevelVariableElt =
|
| - ElementFactory.topLevelVariableElement3(
|
| - "deprecated", true, false, provider.deprecatedType);
|
| + ElementFactory.topLevelVariableElement3(
|
| + "deprecated", true, false, provider.deprecatedType);
|
| {
|
| ClassElement deprecatedElement = provider.deprecatedType.element;
|
| InstanceCreationExpression initializer = AstFactory
|
| .instanceCreationExpression2(
|
| - Keyword.CONST,
|
| - AstFactory.typeName(deprecatedElement),
|
| - [AstFactory.string2('next release')]);
|
| + Keyword.CONST,
|
| + AstFactory.typeName(deprecatedElement),
|
| + [AstFactory.string2('next release')]);
|
| ConstructorElement constructor = deprecatedElement.constructors.single;
|
| initializer.staticElement = constructor;
|
| initializer.constructorName.staticElement = constructor;
|
| @@ -166,18 +166,18 @@ class AnalysisContextFactory {
|
| asyncLibrary = new LibraryElementImpl.forNode(
|
| coreContext, AstFactory.libraryIdentifier2(["dart", "async"]));
|
| CompilationUnitElementImpl asyncUnit =
|
| - new CompilationUnitElementImpl("async.dart");
|
| + new CompilationUnitElementImpl("async.dart");
|
| asyncSource = sourceFactory.forUri(DartSdk.DART_ASYNC);
|
| coreContext.setContents(asyncSource, "");
|
| asyncUnit.librarySource = asyncUnit.source = asyncSource;
|
| asyncLibrary.definingCompilationUnit = asyncUnit;
|
| // Future
|
| ClassElementImpl futureElement =
|
| - ElementFactory.classElement2("Future", ["T"]);
|
| + ElementFactory.classElement2("Future", ["T"]);
|
| futureElement.enclosingElement = asyncUnit;
|
| // factory Future.value([value])
|
| ConstructorElementImpl futureConstructor =
|
| - ElementFactory.constructorElement2(futureElement, "value");
|
| + ElementFactory.constructorElement2(futureElement, "value");
|
| futureConstructor.parameters = <ParameterElement>[
|
| ElementFactory.positionalParameter2("value", provider.dynamicType)
|
| ];
|
| @@ -210,18 +210,18 @@ class AnalysisContextFactory {
|
| futureElement.methods = <MethodElement>[thenMethod];
|
| // Completer
|
| ClassElementImpl completerElement =
|
| - ElementFactory.classElement2("Completer", ["T"]);
|
| + ElementFactory.classElement2("Completer", ["T"]);
|
| ConstructorElementImpl completerConstructor =
|
| - ElementFactory.constructorElement2(completerElement, null);
|
| + ElementFactory.constructorElement2(completerElement, null);
|
| completerElement.constructors = <ConstructorElement>[
|
| completerConstructor
|
| ];
|
| // StreamSubscription
|
| ClassElementImpl streamSubscriptionElement =
|
| - ElementFactory.classElement2("StreamSubscription", ["T"]);
|
| + ElementFactory.classElement2("StreamSubscription", ["T"]);
|
| // Stream
|
| ClassElementImpl streamElement =
|
| - ElementFactory.classElement2("Stream", ["T"]);
|
| + ElementFactory.classElement2("Stream", ["T"]);
|
| streamElement.constructors = <ConstructorElement>[
|
| ElementFactory.constructorElement2(streamElement, null)
|
| ];
|
| @@ -236,7 +236,7 @@ class AnalysisContextFactory {
|
| List<DartType> parameterTypes = <DartType>[listenOnData.type,];
|
| // TODO(brianwilkerson) This is missing the optional parameters.
|
| MethodElementImpl listenMethod =
|
| - ElementFactory.methodElement('listen', returnType, parameterTypes);
|
| + ElementFactory.methodElement('listen', returnType, parameterTypes);
|
| streamElement.methods = <MethodElement>[listenMethod];
|
| listenMethod.type = new FunctionTypeImpl(listenMethod);
|
|
|
| @@ -257,16 +257,16 @@ class AnalysisContextFactory {
|
| // dart:html
|
| //
|
| CompilationUnitElementImpl htmlUnit =
|
| - new CompilationUnitElementImpl("html_dartium.dart");
|
| + new CompilationUnitElementImpl("html_dartium.dart");
|
| Source htmlSource = sourceFactory.forUri(DartSdk.DART_HTML);
|
| coreContext.setContents(htmlSource, "");
|
| htmlUnit.librarySource = htmlUnit.source = htmlSource;
|
| ClassElementImpl elementElement = ElementFactory.classElement2("Element");
|
| InterfaceType elementType = elementElement.type;
|
| ClassElementImpl canvasElement =
|
| - ElementFactory.classElement("CanvasElement", elementType);
|
| + ElementFactory.classElement("CanvasElement", elementType);
|
| ClassElementImpl contextElement =
|
| - ElementFactory.classElement2("CanvasRenderingContext");
|
| + ElementFactory.classElement2("CanvasRenderingContext");
|
| InterfaceType contextElementType = contextElement.type;
|
| ClassElementImpl context2dElement = ElementFactory.classElement(
|
| "CanvasRenderingContext2D", contextElementType);
|
| @@ -281,9 +281,9 @@ class AnalysisContextFactory {
|
| .map((PropertyAccessorElement accessor) => accessor.variable)
|
| .toList();
|
| ClassElementImpl documentElement =
|
| - ElementFactory.classElement("Document", elementType);
|
| + ElementFactory.classElement("Document", elementType);
|
| ClassElementImpl htmlDocumentElement =
|
| - ElementFactory.classElement("HtmlDocument", documentElement.type);
|
| + ElementFactory.classElement("HtmlDocument", documentElement.type);
|
| htmlDocumentElement.methods = <MethodElement>[
|
| ElementFactory
|
| .methodElement("query", elementType, <DartType>[provider.stringType])
|
| @@ -307,8 +307,8 @@ class AnalysisContextFactory {
|
| <ClassElement>[provider.stringType.element], ClassElement.EMPTY_LIST)
|
| ];
|
| TopLevelVariableElementImpl document =
|
| - ElementFactory.topLevelVariableElement3(
|
| - "document", false, true, htmlDocumentElement.type);
|
| + ElementFactory.topLevelVariableElement3(
|
| + "document", false, true, htmlDocumentElement.type);
|
| htmlUnit.topLevelVariables = <TopLevelVariableElement>[document];
|
| htmlUnit.accessors = <PropertyAccessorElement>[document.getter];
|
| LibraryElementImpl htmlLibrary = new LibraryElementImpl.forNode(
|
| @@ -318,7 +318,7 @@ class AnalysisContextFactory {
|
| // dart:math
|
| //
|
| CompilationUnitElementImpl mathUnit =
|
| - new CompilationUnitElementImpl("math.dart");
|
| + new CompilationUnitElementImpl("math.dart");
|
| Source mathSource = sourceFactory.forUri(_DART_MATH);
|
| coreContext.setContents(mathSource, "");
|
| mathUnit.librarySource = mathUnit.source = mathSource;
|
| @@ -330,7 +330,7 @@ class AnalysisContextFactory {
|
| TopLevelVariableElement ln10Element = ElementFactory
|
| .topLevelVariableElement3("LN10", true, false, provider.doubleType);
|
| TypeParameterElement maxT =
|
| - ElementFactory.typeParameterWithType('T', provider.numType);
|
| + ElementFactory.typeParameterWithType('T', provider.numType);
|
| FunctionElementImpl maxElement = ElementFactory.functionElement3(
|
| "max", maxT, [maxT, maxT], ClassElement.EMPTY_LIST);
|
| maxElement.typeParameters = [maxT];
|
| @@ -340,7 +340,7 @@ class AnalysisContextFactory {
|
| ClassElementImpl randomElement = ElementFactory.classElement2("Random");
|
| randomElement.abstract = true;
|
| ConstructorElementImpl randomConstructor =
|
| - ElementFactory.constructorElement2(randomElement, null);
|
| + ElementFactory.constructorElement2(randomElement, null);
|
| randomConstructor.factory = true;
|
| ParameterElementImpl seedParam = new ParameterElementImpl("seed", 0);
|
| seedParam.parameterKind = ParameterKind.POSITIONAL;
|
| @@ -386,7 +386,7 @@ class AnalysisContextFactory {
|
| // Record the elements.
|
| //
|
| HashMap<Source, LibraryElement> elementMap =
|
| - new HashMap<Source, LibraryElement>();
|
| + new HashMap<Source, LibraryElement>();
|
| elementMap[coreSource] = coreLibrary;
|
| if (asyncSource != null) {
|
| elementMap[asyncSource] = asyncLibrary;
|
| @@ -399,7 +399,7 @@ class AnalysisContextFactory {
|
| //
|
| for (LibraryElementImpl library in elementMap.values) {
|
| Namespace namespace =
|
| - new NamespaceBuilder().createPublicNamespaceForLibrary(library);
|
| + new NamespaceBuilder().createPublicNamespaceForLibrary(library);
|
| library.exportNamespace = namespace;
|
| library.publicNamespace = namespace;
|
| }
|
| @@ -421,7 +421,7 @@ class AnalysisContextForTests extends AnalysisContextImpl {
|
| void set analysisOptions(AnalysisOptions options) {
|
| AnalysisOptions currentOptions = analysisOptions;
|
| bool needsRecompute = currentOptions.analyzeFunctionBodiesPredicate !=
|
| - options.analyzeFunctionBodiesPredicate ||
|
| + options.analyzeFunctionBodiesPredicate ||
|
| currentOptions.generateImplicitErrors !=
|
| options.generateImplicitErrors ||
|
| currentOptions.generateSdkErrors != options.generateSdkErrors ||
|
| @@ -517,7 +517,7 @@ class TestPackageUriResolver extends UriResolver {
|
| TestPackageUriResolver(Map<String, String> map) {
|
| map.forEach((String uri, String contents) {
|
| sourceMap[Uri.parse(uri)] =
|
| - new StringSource(contents, '/test_pkg_source.dart');
|
| + new StringSource(contents, '/test_pkg_source.dart');
|
| });
|
| }
|
|
|
|
|