Issue 39021. Guard against invalid generic type alias, without function type.

scheglov · commit-bot@chromium.org · commit 8fbb0530920e · 2019-11-18T16:06:53.000Z
R=brianwilkerson@google.com Bug: #39021 Change-Id: I0259ef04f95e1935ca273b5540aafb069c7ad455 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/125526 Commit-Queue: Konstantin Shcheglov <scheglov@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/type_member_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/type_member_contributor.dart
@@ -184,7 +184,7 @@ class _LocalBestTypeVisitor extends LocalDeclarationVisitor {
   @override
   void declaredGenericTypeAlias(GenericTypeAlias declaration) {
     if (declaration.name.name == targetName) {
-      TypeAnnotation typeName = declaration.functionType.returnType;
+      TypeAnnotation typeName = declaration.functionType?.returnType;
       if (typeName != null) {
         typeFound = typeName.type;
       }
diff --git a/pkg/analysis_server/test/services/completion/dart/type_member_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/type_member_contributor_test.dart
@@ -2068,6 +2068,14 @@ void f(C<int> c) {
     expect(suggestion.element.parameters, '(int value)');
   }
 
+  test_genericTypeAlias_noFunctionType() async {
+    addTestSource('''
+typedef F=;
+g(F.^
+''');
+    await computeSuggestions();
+  }
+
   test_IfStatement() async {
     // SimpleIdentifier  IfStatement
     addTestSource('''
diff --git a/pkg/analyzer_plugin/lib/utilities/completion/type_member_contributor.dart b/pkg/analyzer_plugin/lib/utilities/completion/type_member_contributor.dart
@@ -246,7 +246,7 @@ class _LocalBestTypeVisitor extends LocalDeclarationVisitor {
   @override
   void declaredGenericTypeAlias(GenericTypeAlias declaration) {
     if (declaration.name.name == targetName) {
-      TypeAnnotation typeName = declaration.functionType.returnType;
+      TypeAnnotation typeName = declaration.functionType?.returnType;
       if (typeName != null) {
         typeFound = typeName.type;
       }
diff --git a/pkg/analyzer_plugin/test/utilities/completion/type_member_contributor_test.dart b/pkg/analyzer_plugin/test/utilities/completion/type_member_contributor_test.dart
@@ -2070,6 +2070,14 @@ void f(C<int> c) {
     expect(suggestion.element.parameters, '(int value)');
   }
 
+  test_genericTypeAlias_noFunctionType() async {
+    addTestSource('''
+typedef F=;
+g(F.^
+''');
+    await computeSuggestions();
+  }
+
   test_IfStatement() async {
     // SimpleIdentifier  IfStatement
     addTestSource('''

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ class _LocalBestTypeVisitor extends LocalDeclarationVisitor {`
`184`	`184`	`@override`
`185`	`185`	`void declaredGenericTypeAlias(GenericTypeAlias declaration) {`
`186`	`186`	`if (declaration.name.name == targetName) {`
`187`		`- TypeAnnotation typeName = declaration.functionType.returnType;`
	`187`	`+ TypeAnnotation typeName = declaration.functionType?.returnType;`
`188`	`188`	`if (typeName != null) {`
`189`	`189`	`typeFound = typeName.type;`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ class _LocalBestTypeVisitor extends LocalDeclarationVisitor {`
`246`	`246`	`@override`
`247`	`247`	`void declaredGenericTypeAlias(GenericTypeAlias declaration) {`
`248`	`248`	`if (declaration.name.name == targetName) {`
`249`		`- TypeAnnotation typeName = declaration.functionType.returnType;`
	`249`	`+ TypeAnnotation typeName = declaration.functionType?.returnType;`
`250`	`250`	`if (typeName != null) {`
`251`	`251`	`typeFound = typeName.type;`
`252`	`252`	`}`