fix #28008, fix #28009 implement FutureOr<T>

pkg/analyzer/test/generated/analysis_context_factory.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library analyzer.test.generated.analysis_context_factory;
 
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
@@ skipping 123 matching lines @@
       provider.numType.element,
       objectClassElement,
       overrideClassElement,
       proxyClassElement,
       provider.stackTraceType.element,
       provider.stringType.element,
       provider.symbolType.element,
       provider.typeType.element
     ];
     coreUnit.functions = <FunctionElement>[
-      ElementFactory.functionElement3("identical", provider.boolType.element,
+      ElementFactory.functionElement3("identical", provider.boolType,
           <ClassElement>[objectClassElement, objectClassElement], null),
-      ElementFactory.functionElement3("print", VoidTypeImpl.instance.element,
+      ElementFactory.functionElement3("print", VoidTypeImpl.instance,
           <ClassElement>[objectClassElement], null)
     ];
     TopLevelVariableElement proxyTopLevelVariableElt = ElementFactory
         .topLevelVariableElement3("proxy", true, false, proxyClassElement.type);
     ConstTopLevelVariableElementImpl deprecatedTopLevelVariableElt =
         ElementFactory.topLevelVariableElement3(
             "deprecated", true, false, provider.deprecatedType);
     TopLevelVariableElement overrideTopLevelVariableElt =
         ElementFactory.topLevelVariableElement3(
             "override", true, false, overrideClassElement.type);
@@ skipping 26 matching lines @@
     // dart:async
     //
     LibraryElementImpl asyncLibrary = new LibraryElementImpl.forNode(
         coreContext, AstTestFactory.libraryIdentifier2(["dart", "async"]));
     CompilationUnitElementImpl asyncUnit =
         new CompilationUnitElementImpl("async.dart");
     Source asyncSource = sourceFactory.forUri(DartSdk.DART_ASYNC);
     coreContext.setContents(asyncSource, "");
     asyncUnit.librarySource = asyncUnit.source = asyncSource;
     asyncLibrary.definingCompilationUnit = asyncUnit;
-    // Future
+    // Future<T>
     ClassElementImpl futureElement =
         ElementFactory.classElement2("Future", ["T"]);
+    // FutureOr<T>
+    ClassElementImpl futureOrElement =
+      ElementFactory.classElement2("FutureOr", ["T"]);
     futureElement.enclosingElement = asyncUnit;
     //   factory Future.value([value])
     ConstructorElementImpl futureConstructor =
         ElementFactory.constructorElement2(futureElement, "value");
     futureConstructor.parameters = <ParameterElement>[
       ElementFactory.positionalParameter2("value", provider.dynamicType)
     ];
     futureConstructor.factory = true;
     futureElement.constructors = <ConstructorElement>[futureConstructor];
-    //   Future then(onValue(T value), { Function onError });
+    //   Future<R> then<R>(FutureOr<R> onValue(T value), { Function onError });
     TypeDefiningElement futureThenR = DynamicElementImpl.instance;
+    DartType onValueReturnType = DynamicTypeImpl.instance;
     if (context.analysisOptions.strongMode) {
       futureThenR = ElementFactory.typeParameterWithType('R');
+      onValueReturnType = futureOrElement.type.instantiate([futureThenR.type]);
     }
     FunctionElementImpl thenOnValue = ElementFactory.functionElement3('onValue',
-        DynamicElementImpl.instance, [futureElement.typeParameters[0]], null);
+        onValueReturnType, [futureElement.typeParameters[0]], null);
     thenOnValue.isSynthetic = true;
 
     DartType futureRType = futureElement.type.instantiate([futureThenR.type]);
     MethodElementImpl thenMethod = ElementFactory
         .methodElementWithParameters(futureElement, "then", futureRType, [
       ElementFactory.requiredParameter2("onValue", thenOnValue.type),
       ElementFactory.namedParameter2("onError", provider.functionType)
     ]);
     if (!futureThenR.type.isDynamic) {
       thenMethod.typeParameters = <TypeParameterElement>[futureThenR];
@@ skipping 16 matching lines @@
     // Stream
     ClassElementImpl streamElement =
         ElementFactory.classElement2("Stream", ["T"]);
     streamElement.constructors = <ConstructorElement>[
       ElementFactory.constructorElement2(streamElement, null)
     ];
     DartType returnType = streamSubscriptionElement.type
         .instantiate(streamElement.type.typeArguments);
     FunctionElementImpl listenOnData = ElementFactory.functionElement3(
         'onData',
-        VoidTypeImpl.instance.element,
+        VoidTypeImpl.instance,
         <TypeDefiningElement>[streamElement.typeParameters[0]],
         null);
     listenOnData.isSynthetic = true;
     List<DartType> parameterTypes = <DartType>[
       listenOnData.type,
     ];
     // TODO(brianwilkerson) This is missing the optional parameters.
     MethodElementImpl listenMethod =
         ElementFactory.methodElement('listen', returnType, parameterTypes);
     streamElement.methods = <MethodElement>[listenMethod];
     listenMethod.type = new FunctionTypeImpl(listenMethod);
 
     FunctionElementImpl listenParamFunction = parameterTypes[0].element;
     listenParamFunction.enclosingElement = listenMethod;
     listenParamFunction.type = new FunctionTypeImpl(listenParamFunction);
     ParameterElementImpl listenParam = listenMethod.parameters[0];
     listenParam.type = listenParamFunction.type;
 
     asyncUnit.types = <ClassElement>[
       completerElement,
       futureElement,
+      futureOrElement,
       streamElement,
       streamSubscriptionElement
     ];
     //
     // dart:html
     //
     CompilationUnitElementImpl htmlUnit =
         new CompilationUnitElementImpl("html_dartium.dart");
     Source htmlSource = sourceFactory.forUri(DartSdk.DART_HTML);
     coreContext.setContents(htmlSource, "");
@@ skipping 33 matching lines @@
       contextElement,
       context2dElement,
       ElementFactory.classElement("DivElement", elementType),
       documentElement,
       elementElement,
       htmlDocumentElement,
       ElementFactory.classElement("InputElement", elementType),
       ElementFactory.classElement("SelectElement", elementType)
     ];
     htmlUnit.functions = <FunctionElement>[
-      ElementFactory.functionElement3("query", elementElement,
+      ElementFactory.functionElement3("query", elementElement.type,
           <ClassElement>[provider.stringType.element], ClassElement.EMPTY_LIST)
     ];
     TopLevelVariableElementImpl document =
         ElementFactory.topLevelVariableElement3(
             "document", false, true, htmlDocumentElement.type);
     htmlUnit.topLevelVariables = <TopLevelVariableElement>[document];
     htmlUnit.accessors = <PropertyAccessorElement>[document.getter];
     LibraryElementImpl htmlLibrary = new LibraryElementImpl.forNode(coreContext,
         AstTestFactory.libraryIdentifier2(["dart", "dom", "html"]));
     htmlLibrary.definingCompilationUnit = htmlUnit;
     //
     // dart:math
     //
     CompilationUnitElementImpl mathUnit =
         new CompilationUnitElementImpl("math.dart");
     Source mathSource = sourceFactory.forUri(_DART_MATH);
     coreContext.setContents(mathSource, "");
     mathUnit.librarySource = mathUnit.source = mathSource;
     FunctionElement cosElement = ElementFactory.functionElement3(
         "cos",
-        provider.doubleType.element,
+        provider.doubleType,
         <ClassElement>[provider.numType.element],
         ClassElement.EMPTY_LIST);
     TopLevelVariableElement ln10Element = ElementFactory
         .topLevelVariableElement3("LN10", true, false, provider.doubleType);
     TypeParameterElement maxT =
         ElementFactory.typeParameterWithType('T', provider.numType);
     FunctionElementImpl maxElement = ElementFactory.functionElement3(
-        "max", maxT, [maxT, maxT], ClassElement.EMPTY_LIST);
+        "max", maxT.type, [maxT, maxT], ClassElement.EMPTY_LIST);
     maxElement.typeParameters = [maxT];
     maxElement.type = new FunctionTypeImpl(maxElement);
     TopLevelVariableElement piElement = ElementFactory.topLevelVariableElement3(
         "PI", true, false, provider.doubleType);
     ClassElementImpl randomElement = ElementFactory.classElement2("Random");
     randomElement.abstract = true;
     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,
+        provider.doubleType,
         <ClassElement>[provider.numType.element],
         ClassElement.EMPTY_LIST);
     FunctionElement sqrtElement = ElementFactory.functionElement3(
         "sqrt",
-        provider.doubleType.element,
+        provider.doubleType,
         <ClassElement>[provider.numType.element],
         ClassElement.EMPTY_LIST);
     mathUnit.accessors = <PropertyAccessorElement>[
       ln10Element.getter,
       piElement.getter
     ];
     mathUnit.functions = <FunctionElement>[
       cosElement,
       maxElement,
       sinElement,
@@ skipping 186 matching lines @@
 
   void _addLibrary(LibraryMap map, String uri, bool isInternal, String path) {
     SdkLibraryImpl library = new SdkLibraryImpl(uri);
     if (isInternal) {
       library.category = "Internal";
     }
     library.path = path;
     map.setLibrary(uri, library);
   }
 }