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

Unified Diff: pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart

Issue 1917203002: Remove more type casts (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 4 years, 8 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/resolver/inheritance_manager.dart
diff --git a/pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart b/pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart
index c2a0ed5e1caf4f8b3f017e3d53c65927c7fda87a..76cedf7e607811aa72ca00e90c0b45c79b97db3a 100644
--- a/pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart
@@ -13,6 +13,7 @@ import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/dart/element/member.dart';
import 'package:analyzer/src/dart/element/type.dart';
import 'package:analyzer/src/generated/error.dart';
+import 'package:analyzer/src/generated/java_engine.dart';
import 'package:analyzer/src/generated/type_system.dart';
import 'package:analyzer/src/generated/utilities_dart.dart';
@@ -826,13 +827,10 @@ class InheritanceManager {
for (String memberName in map.keys) {
ExecutableElement executableElement = map[memberName];
if (executableElement is MethodMember) {
- executableElement =
- MethodMember.from(executableElement as MethodMember, superType);
- map[memberName] = executableElement;
+ map[memberName] = MethodMember.from(executableElement, superType);
} else if (executableElement is PropertyAccessorMember) {
- executableElement = PropertyAccessorMember.from(
- executableElement as PropertyAccessorMember, superType);
- map[memberName] = executableElement;
+ map[memberName] =
+ PropertyAccessorMember.from(executableElement, superType);
}
}
}
@@ -956,15 +954,16 @@ class InheritanceManager {
new MultiplyInheritedMethodElementImpl(nameIdentifier);
unionedMethod.inheritedElements = elementArrayToMerge;
executable = unionedMethod;
- } else {
+ } else if (elementToMerge is PropertyAccessorElement) {
MultiplyInheritedPropertyAccessorElementImpl unionedPropertyAccessor =
new MultiplyInheritedPropertyAccessorElementImpl(nameIdentifier);
- unionedPropertyAccessor.getter =
- (elementToMerge as PropertyAccessorElement).isGetter;
- unionedPropertyAccessor.setter =
- (elementToMerge as PropertyAccessorElement).isSetter;
+ unionedPropertyAccessor.getter = elementToMerge.isGetter;
+ unionedPropertyAccessor.setter = elementToMerge.isSetter;
unionedPropertyAccessor.inheritedElements = elementArrayToMerge;
executable = unionedPropertyAccessor;
+ } else {
+ throw new AnalysisException(
+ 'Invalid class of element in merge: ${elementToMerge.runtimeType}');
}
int numOfParameters = numOfRequiredParameters +
numOfPositionalParameters +

Powered by Google App Engine
This is Rietveld 408576698