diff --git a/pkg/analyzer/lib/src/dart/constant/evaluation.dart b/pkg/analyzer/lib/src/dart/constant/evaluation.dart index 23ad1a2df0c..7e477d3c223 100644 --- a/pkg/analyzer/lib/src/dart/constant/evaluation.dart +++ b/pkg/analyzer/lib/src/dart/constant/evaluation.dart @@ -8,6 +8,7 @@ import 'dart:collection'; import 'package:analyzer/context/declared_variables.dart'; import 'package:analyzer/dart/ast/ast.dart'; +import 'package:analyzer/dart/ast/standard_ast_factory.dart'; import 'package:analyzer/dart/ast/token.dart'; import 'package:analyzer/dart/ast/visitor.dart'; import 'package:analyzer/dart/constant/value.dart'; @@ -29,7 +30,6 @@ import 'package:analyzer/src/generated/type_system.dart' import 'package:analyzer/src/generated/utilities_collection.dart'; import 'package:analyzer/src/generated/utilities_dart.dart' show ParameterKind; import 'package:analyzer/src/task/dart.dart'; -import 'package:analyzer/dart/ast/standard_ast_factory.dart'; /** * Helper class encapsulating the methods for evaluating constants and @@ -1292,8 +1292,8 @@ class ConstantVisitor extends UnifyingAstVisitor { } ParameterizedType thenType = thenResult.type; ParameterizedType elseType = elseResult.type; - return new DartObjectImpl.validWithUnknownValue( - _typeSystem.getLeastUpperBound(thenType, elseType) as InterfaceType); + return new DartObjectImpl.validWithUnknownValue(_typeSystem + .getLeastUpperBound(thenType, elseType) as ParameterizedType); } @override diff --git a/pkg/analyzer/lib/src/dart/constant/value.dart b/pkg/analyzer/lib/src/dart/constant/value.dart index db4de37f830..a927df61a25 100644 --- a/pkg/analyzer/lib/src/dart/constant/value.dart +++ b/pkg/analyzer/lib/src/dart/constant/value.dart @@ -144,9 +144,6 @@ class DartObjectImpl implements DartObject { */ static const List EMPTY_LIST = const []; - /** - * The run-time type of this object. - */ @override final ParameterizedType type; @@ -163,7 +160,7 @@ class DartObjectImpl implements DartObject { /** * Create an object to represent an unknown value. */ - factory DartObjectImpl.validWithUnknownValue(InterfaceType type) { + factory DartObjectImpl.validWithUnknownValue(ParameterizedType type) { if (type.element.library.isDartCore) { String typeName = type.name; if (typeName == "bool") {