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

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

Issue 2984153002: Start marking @_fastaProblem, fix for unresolved mixin, fix for type parameter context. (Closed)
Patch Set: Created 3 years, 5 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
« no previous file with comments | « no previous file | pkg/analyzer/test/src/summary/resynthesize_common.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/dart/element/element.dart
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
index 0e58ac100e97fd9f05cb792f64c45976489f44c9..643343deb880ad5faaa8c7938b02bf20029f5c88 100644
--- a/pkg/analyzer/lib/src/dart/element/element.dart
+++ b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -1265,8 +1265,13 @@ class ClassElementImpl extends AbstractClassElementImpl
while (supertype.classNode.isSyntheticMixinImplementation) {
var superNode = supertype.classNode;
var substitute = kernel.Substitution.fromSupertype(supertype);
- var thisMixin = substitute.substituteSupertype(superNode.mixedInType);
- _kernelMixins.add(thisMixin);
+
+ var superMixin = superNode.mixedInType;
+ if (superMixin != null) {
+ var thisMixin = substitute.substituteSupertype(superMixin);
+ _kernelMixins.add(thisMixin);
+ }
+
supertype = substitute.substituteSupertype(superNode.supertype);
}
_kernelMixins = _kernelMixins.reversed.toList();
« no previous file with comments | « no previous file | pkg/analyzer/test/src/summary/resynthesize_common.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698