set thisType for functions and void types

pq · pq · commit 59c63139d0a8 · 2019-08-07T22:57:14.000Z
Change-Id: I7886d02b982bd0303074cb4c2370a9bc72258d58 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112261 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -3815,10 +3815,7 @@ class ResolverVisitor extends ScopedVisitor {
     //
     try {
       DartType extendedType = node.declaredElement.extendedType;
-      if (extendedType is InterfaceType) {
-        // TODO(brianwilkerson) Handle other cases.
-        typeAnalyzer.thisType = extendedType;
-      }
+      typeAnalyzer.thisType = typeSystem.resolveToBound(extendedType);
       super.visitExtensionDeclaration(node);
       node.accept(elementResolver);
       node.accept(typeAnalyzer);
diff --git a/pkg/analyzer/lib/src/generated/static_type_analyzer.dart b/pkg/analyzer/lib/src/generated/static_type_analyzer.dart
@@ -69,7 +69,7 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
    * The type representing the class containing the nodes being analyzed,
    * or `null` if the nodes are not within a class.
    */
-  InterfaceType thisType;
+  DartType thisType;
 
   /**
    * The object providing promoted or declared types of variables.
diff --git a/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart b/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart
@@ -195,6 +195,26 @@ f(C c) {
 /// by code external to the extension declaration.
 @reflectiveTest
 class ExtensionMethodsExternalReferenceTest extends BaseExtensionMethodsTest {
+  /// Corresponds to: extension_member_resolution_t07
+  test_dynamicInvocation() async {
+    await assertNoErrorsInCode(r'''
+class A {}
+class C extends A {
+  String method(int i) => "$i";
+  noSuchMethod(Invocation i) { }
+}
+
+extension E<T extends A> on T {
+  String method(int i, String s) => '';
+}
+
+main() {
+  dynamic c = new C();
+  c.method(42, "-42");
+}
+''');
+  }
+
   test_instance_call_fromExtendedType() async {
     await assertNoErrorsInCode('''
 class C {
@@ -1014,6 +1034,35 @@ f() => E.a;
     assertElement(identifier, findElement.method('a'));
     assertType(identifier, 'void Function(int)');
   }
+
+  test_thisAccessOnDynamic() async {
+    await assertNoErrorsInCode('''
+extension on dynamic {
+  int get d => 3;
+
+  void testDynamic() {
+    // Static type of `this` is dynamic, allows dynamic invocation.
+    this.arglebargle();
+  }
+}
+''');
+  }
+
+  test_thisAccessOnFunction() async {
+    await assertNoErrorsInCode('''
+extension on Function {
+  int get f => 4;
+
+  void testFunction() {
+    // Static type of `this` is Function. Allows any dynamic invocation.
+    this();
+    this(1);
+    this(x: 1);
+    // No function can have both optional positional and named parameters.
+  }
+}
+''');
+  }
 }
 
 /// Tests that extension members can be correctly resolved when referenced
diff --git a/pkg/analyzer/test/src/diagnostics/use_of_void_result_test.dart b/pkg/analyzer/test/src/diagnostics/use_of_void_result_test.dart
@@ -2,6 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/src/dart/analysis/experiments.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/generated/engine.dart';
@@ -13,6 +14,7 @@ import '../dart/resolution/driver_resolution.dart';
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(UseOfVoidResultTest);
+    defineReflectiveTests(UseOfVoidResultWithExtensionMethodsTest);
     defineReflectiveTests(UseOfVoidResultTest_NonNullable);
   });
 }
@@ -567,3 +569,24 @@ g() {
 ''', [ExpectedError(StaticWarningCode.USE_OF_VOID_RESULT, 23, 4)]);
   }
 }
+
+@reflectiveTest
+class UseOfVoidResultWithExtensionMethodsTest extends UseOfVoidResultTest {
+  @override
+  AnalysisOptionsImpl get analysisOptions => AnalysisOptionsImpl()
+    ..contextFeatures = FeatureSet.forTesting(
+        sdkVersion: '2.3.0', additionalFeatures: [Feature.extension_methods]);
+
+  test_useOfVoidReturnInExtensionMethod() async {
+    await assertErrorsInCode('''
+extension on void {
+  testVoid() {
+    // No access on void. Static type of `this` is void!
+    this.toString();
+  }
+}
+''', [
+      error(StaticWarningCode.USE_OF_VOID_RESULT, 96, 4),
+    ]);
+  }
+}
