dart-lang
diff --git a/‎pkg/analyzer/lib/src/dart/resolver/scope.dart‎
Lines changed: 2 additions & 6 deletions b/‎pkg/analyzer/lib/src/dart/resolver/scope.dart‎
Lines changed: 2 additions & 6 deletions
diff --git a/‎pkg/analyzer/lib/src/generated/resolver.dart‎
Lines changed: 4 additions & 1 deletion b/‎pkg/analyzer/lib/src/generated/resolver.dart‎
Lines changed: 4 additions & 1 deletion
@@ -162,16 +162,12 @@ class ExtensionScope extends EnclosedScope {
     List<PropertyAccessorElement> accessors = extensionElement.accessors;
     int accessorLength = accessors.length;
     for (int i = 0; i < accessorLength; i++) {
-      if (accessors[i].isStatic) {
-        define(accessors[i]);
-      }
+      define(accessors[i]);
     }
     List<MethodElement> methods = extensionElement.methods;
     int methodLength = methods.length;
     for (int i = 0; i < methodLength; i++) {
-      if (methods[i].isStatic) {
-        define(methods[i]);
-      }
+      define(methods[i]);
     }
   }
 }
 
@@ -4466,7 +4466,10 @@ class ResolverVisitor extends ScopedVisitor {
     // Continue the extension resolution.
     //
     try {
-      typeAnalyzer.thisType = node.declaredElement.extendedType;
+      DartType extendedType = node.declaredElement.extendedType;
+      if (extendedType is InterfaceType) {
+        typeAnalyzer.thisType = extendedType;
+      }
       super.visitExtensionDeclaration(node);
       node.accept(elementResolver);
       node.accept(typeAnalyzer);
Original file line number	Diff line number	Diff line change
`@@ -162,16 +162,12 @@ class ExtensionScope extends EnclosedScope {`
`162`	`162`	`List<PropertyAccessorElement> accessors = extensionElement.accessors;`
`163`	`163`	`int accessorLength = accessors.length;`
`164`	`164`	`for (int i = 0; i < accessorLength; i++) {`
`165`		`- if (accessors[i].isStatic) {`
`166`		`- define(accessors[i]);`
`167`		`- }`
	`165`	`+ define(accessors[i]);`
`168`	`166`	`}`
`169`	`167`	`List<MethodElement> methods = extensionElement.methods;`
`170`	`168`	`int methodLength = methods.length;`
`171`	`169`	`for (int i = 0; i < methodLength; i++) {`
`172`		`- if (methods[i].isStatic) {`
`173`		`- define(methods[i]);`
`174`		`- }`
	`170`	`+ define(methods[i]);`
`175`	`171`	`}`
`176`	`172`	`}`
`177`	`173`	`}`