Version 1.23.0-dev.11.7
Cherry-pick 1a8ef13fd11316547c97d5d537c675e3c5ed87d9 to dev
Cherry-pick 1910147425fe5ffcc840ba60830e88756454c5d5 to dev
diff --git a/DEPS b/DEPS
index ab3a7bc..2fafc01 100644
--- a/DEPS
+++ b/DEPS
@@ -37,7 +37,7 @@
"gperftools_revision": "@02eeed29df112728564a5dde6417fa4622b57a06",
# Revisions of /third_party/* dependencies.
- "angular_analyzer_plugin_tag": "@v0.0.5",
+ "angular_analyzer_plugin_tag": "@v0.0.7",
"args_tag": "@0.13.7",
"async_tag": "@1.13.0",
"barback-0.13.0_rev": "@34853",
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
index 173a2c8..ccfa988 100644
--- a/pkg/analyzer/lib/src/generated/resolver.dart
+++ b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -10183,7 +10183,7 @@
if (returnType == null) {
return _dynamicType;
} else {
- return returnType.type;
+ return _typeNameResolver._getType(returnType);
}
}
diff --git a/pkg/analyzer/test/generated/non_error_resolver_driver_test.dart b/pkg/analyzer/test/generated/non_error_resolver_driver_test.dart
index b18fe32..be0f9b5 100644
--- a/pkg/analyzer/test/generated/non_error_resolver_driver_test.dart
+++ b/pkg/analyzer/test/generated/non_error_resolver_driver_test.dart
@@ -16,4 +16,9 @@
class NonErrorResolverTest_Driver extends NonErrorResolverTest {
@override
bool get enableNewAnalysisDriver => true;
+
+ @failingTest
+ test_genericTypeAlias_fieldAndReturnType() async {
+ return super.test_genericTypeAlias_fieldAndReturnType();
+ }
}
diff --git a/pkg/analyzer/test/generated/non_error_resolver_test.dart b/pkg/analyzer/test/generated/non_error_resolver_test.dart
index 0f5557f..e89057b 100644
--- a/pkg/analyzer/test/generated/non_error_resolver_test.dart
+++ b/pkg/analyzer/test/generated/non_error_resolver_test.dart
@@ -2158,6 +2158,27 @@
verify([source]);
}
+ test_genericTypeAlias_fieldAndReturnType() async {
+ Source source = addSource(r'''
+typedef Foo = int Function<T>(T x);
+int foo<T>(T x) => 3;
+Foo bar() => foo;
+void test1() {
+ bar()<String>("hello");
+}
+
+class A {
+ Foo f;
+ void test() {
+ f<String>("hello");
+ }
+}
+''');
+ await computeAnalysisResult(source);
+ assertNoErrors(source);
+ verify([source]);
+ }
+
test_genericTypeAlias_noTypeParameters() async {
Source source = addSource(r'''
typedef Foo = int Function<T>(T x);
diff --git a/tools/VERSION b/tools/VERSION
index 17689a2..e09399d 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
MINOR 23
PATCH 0
PRERELEASE 11
-PRERELEASE_PATCH 6
+PRERELEASE_PATCH 7
