-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Initial support for extension methods inference.
Only the case with ExtensionOverride is supported for now. Still fixes some co19 tests. [email protected], [email protected] Change-Id: I6c7c98f4839a1fc40504d93107648d952a4176d2 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/111866 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
- Loading branch information
1 parent
6653611
commit 4bebfeb
Showing
11 changed files
with
247 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
139 changes: 139 additions & 0 deletions
139
pkg/analyzer/test/src/dart/resolution/type_inference/extension_methods_test.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| // Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file | ||
| // 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/generated/engine.dart'; | ||
| import 'package:test_reflective_loader/test_reflective_loader.dart'; | ||
|
|
||
| import '../driver_resolution.dart'; | ||
|
|
||
| main() { | ||
| defineReflectiveSuite(() { | ||
| defineReflectiveTests(ExtensionMethodsTest); | ||
| }); | ||
| } | ||
|
|
||
| @reflectiveTest | ||
| class ExtensionMethodsTest extends DriverResolutionTest { | ||
| @override | ||
| AnalysisOptionsImpl get analysisOptions => AnalysisOptionsImpl() | ||
| ..contextFeatures = new FeatureSet.forTesting( | ||
| sdkVersion: '2.3.0', additionalFeatures: [Feature.extension_methods]); | ||
|
|
||
| test_override_hasTypeArguments_getter() async { | ||
| await assertNoErrorsInCode(''' | ||
| class A<T> {} | ||
| extension E<T> on A<T> { | ||
| List<T> get foo => <T>[]; | ||
| } | ||
| void f(A<int> a) { | ||
| E<num>(a).foo; | ||
| } | ||
| '''); | ||
| var override = findNode.extensionOverride('E<num>(a)'); | ||
| assertElement(override, findElement.extension_('E')); | ||
| assertElementTypeStrings(override.typeArgumentTypes, ['num']); | ||
| assertElementTypeString(override.extendedType, 'A<num>'); | ||
|
|
||
| var propertyAccess = findNode.propertyAccess('.foo'); | ||
| assertMember( | ||
| propertyAccess, | ||
| findElement.getter('foo', of: 'E'), | ||
| {'T': 'num'}, | ||
| ); | ||
| assertType(propertyAccess, 'List<num>'); | ||
| } | ||
|
|
||
| test_override_hasTypeArguments_method() async { | ||
| await assertNoErrorsInCode(''' | ||
| class A<T> {} | ||
| extension E<T> on A<T> { | ||
| Map<T, U> foo<U>(U u) => <T, U>{}; | ||
| } | ||
| void f(A<int> a) { | ||
| E<num>(a).foo(1.0); | ||
| } | ||
| '''); | ||
| var override = findNode.extensionOverride('E<num>(a)'); | ||
| assertElement(override, findElement.extension_('E')); | ||
| assertElementTypeStrings(override.typeArgumentTypes, ['num']); | ||
| assertElementTypeString(override.extendedType, 'A<num>'); | ||
|
|
||
| // TODO(scheglov) We need to instantiate "foo" fully. | ||
| var invocation = findNode.methodInvocation('foo(1.0)'); | ||
| assertMember( | ||
| invocation, | ||
| findElement.method('foo', of: 'E'), | ||
| {'T': 'num'}, | ||
| ); | ||
| // assertMember( | ||
| // invocation, | ||
| // findElement.method('foo', of: 'E'), | ||
| // {'T': 'int', 'U': 'double'}, | ||
| // ); | ||
| assertInvokeType(invocation, 'Map<num, double> Function(double)'); | ||
| } | ||
|
|
||
| test_override_inferTypeArguments_getter() async { | ||
| await assertNoErrorsInCode(''' | ||
| class A<T> {} | ||
| extension E<T> on A<T> { | ||
| List<T> get foo => <T>[]; | ||
| } | ||
| void f(A<int> a) { | ||
| E(a).foo; | ||
| } | ||
| '''); | ||
| var override = findNode.extensionOverride('E(a)'); | ||
| assertElement(override, findElement.extension_('E')); | ||
| assertElementTypeStrings(override.typeArgumentTypes, ['int']); | ||
| assertElementTypeString(override.extendedType, 'A<int>'); | ||
|
|
||
| var propertyAccess = findNode.propertyAccess('.foo'); | ||
| assertMember( | ||
| propertyAccess, | ||
| findElement.getter('foo', of: 'E'), | ||
| {'T': 'int'}, | ||
| ); | ||
| assertType(propertyAccess, 'List<int>'); | ||
| } | ||
|
|
||
| test_override_inferTypeArguments_method() async { | ||
| await assertNoErrorsInCode(''' | ||
| class A<T> {} | ||
| extension E<T> on A<T> { | ||
| Map<T, U> foo<U>(U u) => <T, U>{}; | ||
| } | ||
| void f(A<int> a) { | ||
| E(a).foo(1.0); | ||
| } | ||
| '''); | ||
| var override = findNode.extensionOverride('E(a)'); | ||
| assertElement(override, findElement.extension_('E')); | ||
| assertElementTypeStrings(override.typeArgumentTypes, ['int']); | ||
| assertElementTypeString(override.extendedType, 'A<int>'); | ||
|
|
||
| // TODO(scheglov) We need to instantiate "foo" fully. | ||
| var invocation = findNode.methodInvocation('foo(1.0)'); | ||
| assertMember( | ||
| invocation, | ||
| findElement.method('foo', of: 'E'), | ||
| {'T': 'int'}, | ||
| ); | ||
| // assertMember( | ||
| // invocation, | ||
| // findElement.method('foo', of: 'E'), | ||
| // {'T': 'int', 'U': 'double'}, | ||
| // ); | ||
| assertInvokeType(invocation, 'Map<int, double> Function(double)'); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters