File tree 3 files changed +4
-5
lines changed
3 files changed +4
-5
lines changed Original file line number Diff line number Diff line change @@ -304,9 +304,8 @@ class Class extends Container
304
304
}
305
305
306
306
var inheritance = definingLibrary.inheritanceManager;
307
- var classType = element.thisType;
308
- var cmap = inheritance.getInheritedConcreteMap (classType);
309
- var imap = inheritance.getInheritedMap (classType);
307
+ var cmap = inheritance.getInheritedConcreteMap2 (element);
308
+ var imap = inheritance.getInheritedMap2 (element);
310
309
311
310
var combinedMap = < String , ExecutableElement > {};
312
311
for (var nameObj in cmap.keys) {
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ class Extension extends Container
25
25
bool get alwaysApplies =>
26
26
extendedType.instantiatedType.isDynamic ||
27
27
extendedType.instantiatedType.isVoid ||
28
- extendedType.instantiatedType.isObject ;
28
+ extendedType.instantiatedType.isDartCoreObject ;
29
29
30
30
bool couldApplyTo <T extends ExtensionTarget >(T c) =>
31
31
_couldApplyTo (c.modelType);
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ mixin GetterSetterCombo on ModelElement {
50
50
if (constantInitializer is ! InstanceCreationExpression ) return original;
51
51
var creationExpression = constantInitializer as InstanceCreationExpression ;
52
52
var constructorName = creationExpression.constructorName.toString ();
53
- Element staticElement = creationExpression.staticElement;
53
+ Element staticElement = creationExpression.constructorName. staticElement;
54
54
if (staticElement == null ) {
55
55
warn (PackageWarning .missingConstantConstructor, message: constructorName);
56
56
return original;
You can’t perform that action at this time.
0 commit comments