Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(965)

Unified Diff: pkg/analyzer/lib/src/dart/element/type.dart

Issue 2326813002: Replace and remove JavaException(s). (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analyzer/lib/src/dart/element/type.dart
diff --git a/pkg/analyzer/lib/src/dart/element/type.dart b/pkg/analyzer/lib/src/dart/element/type.dart
index 2c59228796fe5cf96fea8c7be536a8a734ec750f..de73679e68fcb507c6996ee6ab9105658ce66397 100644
--- a/pkg/analyzer/lib/src/dart/element/type.dart
+++ b/pkg/analyzer/lib/src/dart/element/type.dart
@@ -711,6 +711,7 @@ class FunctionTypeImpl extends TypeImpl implements FunctionType {
needsComma = true;
}
}
+
void startOptionalParameters() {
if (needsComma) {
buffer.write(", ");
@@ -759,7 +760,7 @@ class FunctionTypeImpl extends TypeImpl implements FunctionType {
@override
FunctionTypeImpl instantiate(List<DartType> argumentTypes) {
if (argumentTypes.length != typeFormals.length) {
- throw new IllegalArgumentException(
+ throw new ArgumentError(
"argumentTypes.length (${argumentTypes.length}) != "
"typeFormals.length (${typeFormals.length})");
}
@@ -838,7 +839,7 @@ class FunctionTypeImpl extends TypeImpl implements FunctionType {
// substituting once.
assert(this.prunedTypedefs == null);
if (argumentTypes.length != parameterTypes.length) {
- throw new IllegalArgumentException(
+ throw new ArgumentError(
"argumentTypes.length (${argumentTypes.length}) != parameterTypes.length (${parameterTypes.length})");
}
Element element = this.element;
@@ -1849,7 +1850,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
List<DartType> argumentTypes, List<DartType> parameterTypes,
[List<FunctionTypeAliasElement> prune]) {
if (argumentTypes.length != parameterTypes.length) {
- throw new IllegalArgumentException(
+ throw new ArgumentError(
"argumentTypes.length (${argumentTypes.length}) != parameterTypes.length (${parameterTypes.length})");
}
if (argumentTypes.length == 0 || typeArguments.length == 0) {
@@ -1936,6 +1937,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
visitedClasses.remove(type.element);
}
}
+
recurse(this);
return result;
}
@@ -1959,7 +1961,25 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
List<InterfaceType> s = _intersection(si, sj);
return computeTypeAtMaxUniqueDepth(s);
}
-
+
+ /**
+ * Return the length of the longest inheritance path from the given [type] to
+ * Object.
+ *
+ * See [computeLeastUpperBound].
+ */
+ static int computeLongestInheritancePathToObject(InterfaceType type) =>
+ _computeLongestInheritancePathToObject(
+ type, 0, new HashSet<ClassElement>());
+
+ /**
+ * Returns the set of all superinterfaces of the given [type].
+ *
+ * See [computeLeastUpperBound].
+ */
+ static Set<InterfaceType> computeSuperinterfaceSet(InterfaceType type) =>
+ _computeSuperinterfaceSet(type, new HashSet<InterfaceType>());
+
/**
* Return the type from the [types] list that has the longest inheritence path
* to Object of unique length.
@@ -1996,24 +2016,6 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
}
/**
- * Return the length of the longest inheritance path from the given [type] to
- * Object.
- *
- * See [computeLeastUpperBound].
- */
- static int computeLongestInheritancePathToObject(InterfaceType type) =>
- _computeLongestInheritancePathToObject(
- type, 0, new HashSet<ClassElement>());
-
- /**
- * Returns the set of all superinterfaces of the given [type].
- *
- * See [computeLeastUpperBound].
- */
- static Set<InterfaceType> computeSuperinterfaceSet(InterfaceType type) =>
- _computeSuperinterfaceSet(type, new HashSet<InterfaceType>());
-
- /**
* If there is a single type which is at least as specific as all of the
* types in [types], return it. Otherwise return `null`.
*/
@@ -2187,7 +2189,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
ClassElement firstElement = firstType.element;
ClassElement secondElement = secondType.element;
if (firstElement != secondElement) {
- throw new IllegalArgumentException('The same elements expected, but '
+ throw new ArgumentError('The same elements expected, but '
'$firstElement and $secondElement are given.');
}
if (firstType == secondType) {

Powered by Google App Engine
This is Rietveld 408576698