| Index: pkg/analyzer/lib/src/task/inputs.dart
|
| diff --git a/pkg/analyzer/lib/src/task/inputs.dart b/pkg/analyzer/lib/src/task/inputs.dart
|
| index 2236ca087c8b72eb3d671fc1ad86d30599e4a040..1134a58a6629c8c4078f0353f28f46509ed959a8 100644
|
| --- a/pkg/analyzer/lib/src/task/inputs.dart
|
| +++ b/pkg/analyzer/lib/src/task/inputs.dart
|
| @@ -89,26 +89,28 @@ class ListTaskInputImpl<E> extends SimpleTaskInput<List<E>>
|
| */
|
| abstract class ListTaskInputMixin<E> implements ListTaskInput<E> {
|
| @override
|
| - ListTaskInput /*<V>*/ toFlattenListOf(
|
| + ListTaskInput /*<V>*/ toFlattenListOf /*<V>*/ (
|
| ListResultDescriptor /*<V>*/ subListResult) {
|
| - return new ListToFlattenListTaskInput<E, dynamic /*V*/ >(
|
| + return new ListToFlattenListTaskInput<E, dynamic /*=V*/ >(
|
| this, subListResult.of as dynamic);
|
| }
|
|
|
| - ListTaskInput /*<V>*/ toList(UnaryFunction<E, dynamic /*<V>*/ > mapper) {
|
| - return new ListToListTaskInput<E, dynamic /*V*/ >(this, mapper);
|
| + ListTaskInput /*<V>*/ toList /*<V>*/ (
|
| + UnaryFunction<E, dynamic /*<=V>*/ > mapper) {
|
| + return new ListToListTaskInput<E, dynamic /*=V*/ >(this, mapper);
|
| }
|
|
|
| - ListTaskInput /*<V>*/ toListOf(ResultDescriptor /*<V>*/ valueResult) {
|
| + ListTaskInput /*<V>*/ toListOf /*<V>*/ (
|
| + ResultDescriptor /*<V>*/ valueResult) {
|
| return (this as ListTaskInput<AnalysisTarget>).toList(valueResult.of);
|
| }
|
|
|
| - MapTaskInput<E, dynamic /*V*/ > toMap(
|
| - UnaryFunction<E, dynamic /*<V>*/ > mapper) {
|
| - return new ListToMapTaskInput<E, dynamic /*V*/ >(this, mapper);
|
| + MapTaskInput<E, dynamic /*=V*/ > toMap /*<V>*/ (
|
| + UnaryFunction<E, dynamic /*<=V>*/ > mapper) {
|
| + return new ListToMapTaskInput<E, dynamic /*=V*/ >(this, mapper);
|
| }
|
|
|
| - MapTaskInput<AnalysisTarget, dynamic /*V*/ > toMapOf(
|
| + MapTaskInput<AnalysisTarget, dynamic /*=V*/ > toMapOf /*<V>*/ (
|
| ResultDescriptor /*<V>*/ valueResult) {
|
| return (this as ListTaskInputImpl<AnalysisTarget>).toMap(valueResult.of);
|
| }
|
| @@ -277,11 +279,10 @@ class ListToMapTaskInputBuilder<B, E>
|
| * A mixin-ready implementation of [MapTaskInput].
|
| */
|
| abstract class MapTaskInputMixin<K, V> implements MapTaskInput<K, V> {
|
| - TaskInput<List /*<E>*/ > toFlattenList(
|
| - BinaryFunction<K, dynamic /*element of V*/, dynamic /*<E>*/ > mapper) {
|
| + TaskInput<List /*<E>*/ > toFlattenList /*<E>*/ (
|
| + BinaryFunction<K, dynamic /*element of V*/, dynamic /*<=E>*/ > mapper) {
|
| return new MapToFlattenListTaskInput<K, dynamic /*element of V*/,
|
| - dynamic /*E*/ >(
|
| - this as MapTaskInput<K, List /*<element of V>*/ >, mapper);
|
| + dynamic /*=E*/ >(this as MapTaskInput<K, List /*<element of V>*/ >, mapper);
|
| }
|
| }
|
|
|
| @@ -440,22 +441,23 @@ class ObjectToListTaskInput<E> extends TaskInputImpl<List<E>>
|
| new ObjectToListTaskInputBuilder<E>(this);
|
|
|
| @override
|
| - ListTaskInput /*<V>*/ toFlattenListOf(
|
| + ListTaskInput /*<V>*/ toFlattenListOf /*<V>*/ (
|
| ListResultDescriptor /*<V>*/ subListResult) {
|
| - return new ListToFlattenListTaskInput<E, dynamic /*V*/ >(
|
| + return new ListToFlattenListTaskInput<E, dynamic /*=V*/ >(
|
| this, subListResult.of as dynamic);
|
| }
|
|
|
| @override
|
| - ListTaskInput /*<V>*/ toListOf(ResultDescriptor /*<V>*/ valueResult) {
|
| - return new ListToListTaskInput<E, dynamic /*V*/ >(
|
| + ListTaskInput /*<V>*/ toListOf /*<V>*/ (
|
| + ResultDescriptor /*<V>*/ valueResult) {
|
| + return new ListToListTaskInput<E, dynamic /*=V*/ >(
|
| this, valueResult.of as dynamic);
|
| }
|
|
|
| @override
|
| - MapTaskInput<AnalysisTarget, dynamic /*V*/ > toMapOf(
|
| + MapTaskInput<AnalysisTarget, dynamic /*=V*/ > toMapOf /*<V>*/ (
|
| ResultDescriptor /*<V>*/ valueResult) {
|
| - return new ListToMapTaskInput<AnalysisTarget, dynamic /*V*/ >(
|
| + return new ListToMapTaskInput<AnalysisTarget, dynamic /*=V*/ >(
|
| this as dynamic, valueResult.of);
|
| }
|
| }
|
| @@ -694,7 +696,7 @@ class SimpleTaskInputBuilder<V> implements TaskInputBuilder<V> {
|
|
|
| abstract class TaskInputImpl<V> implements TaskInput<V> {
|
| @override
|
| - ListTaskInput /*<E>*/ mappedToList(List /*<E>*/ mapper(V value)) {
|
| + ListTaskInput /*<E>*/ mappedToList /*<E>*/ (List /*<E>*/ mapper(V value)) {
|
| return new ObjectToListTaskInput(this, mapper);
|
| }
|
| }
|
|
|