Partial fix for parsing explicitly typed super formal parameters.

scheglov · Commit Bot · commit 2766add19a27 · 2022-01-04T16:19:06.000Z
I need at least this much to cover a few test cases in the analyzer, but it might be not the best implementation. It seems to not break anything, so maybe we can land this for now, while we are waiting for the better fix of the referenced issue? Bug: dart-lang/sdk#47951 Change-Id: I428e32f4435b3229cb2dc41678182cde0e2f98e8 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/226200 Reviewed-by: Chloe Stefantsova <cstefantsova@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/type_info.dart b/pkg/_fe_analyzer_shared/lib/src/parser/type_info.dart
@@ -251,6 +251,18 @@ TypeInfo computeType(final Token token, bool required,
 
   assert(typeParamOrArg == noTypeParamOrArg);
   next = next.next!;
+
+  // TODO(scheglov) This is a hack to partially fix.
+  // https://github.com/dart-lang/sdk/issues/47951
+  if (optional('?', next) &&
+      optional('super', next.next!) &&
+      optional('.', next.next!.next!)) {
+    return simpleNullableType;
+  }
+  if (optional('super', next) && optional('.', next.next!)) {
+    return simpleType;
+  }
+
   if (optional('.', next)) {
     next = next.next!;
     if (isValidTypeReference(next)) {
diff --git a/pkg/analyzer/lib/src/summary2/informative_data.dart b/pkg/analyzer/lib/src/summary2/informative_data.dart
@@ -1370,6 +1370,9 @@ class _InformativeDataWriter {
       } else if (notDefault is FunctionTypedFormalParameter) {
         _writeTypeParameters(notDefault.typeParameters);
         _writeFormalParameters(notDefault.parameters);
+      } else if (notDefault is SuperFormalParameter) {
+        _writeTypeParameters(notDefault.typeParameters);
+        _writeFormalParameters(notDefault.parameters);
       } else {
         _writeTypeParameters(null);
         _writeFormalParameters(null);
diff --git a/pkg/analyzer/test/generated/utilities_test.dart b/pkg/analyzer/test/generated/utilities_test.dart
@@ -1644,7 +1644,6 @@ class A {
     );
   }
 
-  @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/47951')
   void test_superFormalParameter() {
     var findNode = _parseStringToFindNode(r'''
 class A {
@@ -1666,7 +1665,6 @@ class B extends A {
     );
   }
 
-  @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/47741')
   void test_superFormalParameter_functionTyped() {
     var findNode = _parseStringToFindNode(r'''
 class A {
diff --git a/pkg/analyzer/test/src/summary/resynthesize_common.dart b/pkg/analyzer/test/src/summary/resynthesize_common.dart
@@ -1453,7 +1453,6 @@ library
 ''');
   }
 
-  @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/47951')
   test_class_constructor_parameters_super_explicitType_function() async {
     var library = await checkLibrary('''
 class A {
@@ -1492,7 +1491,6 @@ library
 ''');
   }
 
-  @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/47951')
   test_class_constructor_parameters_super_explicitType_interface() async {
     var library = await checkLibrary('''
 class A {
@@ -1518,13 +1516,45 @@ library
         constructors
           @47
             parameters
-              requiredPositional final super.a @49
+              requiredPositional final super.a @59
                 type: int
                 superConstructorParameter: a@18
             superConstructor: self::@class::A::@constructor::•
 ''');
   }
 
+  test_class_constructor_parameters_super_explicitType_interface_nullable() async {
+    var library = await checkLibrary('''
+class A {
+  A(num? a);
+}
+
+class B extends A {
+  B(int? super.a);
+}
+''');
+    checkElementText(library, r'''
+library
+  definingUnit
+    classes
+      class A @6
+        constructors
+          @12
+            parameters
+              requiredPositional a @19
+                type: num?
+      class B @32
+        supertype: A
+        constructors
+          @48
+            parameters
+              requiredPositional final super.a @61
+                type: int?
+                superConstructorParameter: a@19
+            superConstructor: self::@class::A::@constructor::•
+''');
+  }
+
   test_class_constructor_parameters_super_invalid_topFunction() async {
     var library = await checkLibrary('''
 void f(super.a) {}
diff --git a/pkg/front_end/testcases/super_parameters/default_values.dart.strong.expect b/pkg/front_end/testcases/super_parameters/default_values.dart.strong.expect
@@ -2,13 +2,10 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/super_parameters/default_values.dart:51:11: Error: Expected ']' before this.
+// pkg/front_end/testcases/super_parameters/default_values.dart:51:17: Error: The parameter 'x' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
+// Try adding either an explicit non-'null' default value or the 'required' modifier.
 //   C5([int super.x]); // Error.
-//           ^^^^^
-//
-// pkg/front_end/testcases/super_parameters/default_values.dart:61:10: Error: Expected ']' before this.
-//   C6([int? super.x]); // Ok.
-//          ^
+//                 ^
 //
 import self as self;
 import "dart:core" as core;
@@ -68,8 +65,8 @@ class S5 extends core::Object {
     ;
 }
 class C5 extends self::S5 {
-  constructor •([dynamic int = #C4]) → self::C5
-    : super self::S5::•()
+  constructor •([core::int x = #C4]) → self::C5
+    : super self::S5::•(x)
     ;
 }
 class S6 extends core::Object {
@@ -80,8 +77,8 @@ class S6 extends core::Object {
 }
 class C6 extends self::S6 {
   field core::int? b = null;
-  constructor •([dynamic int = #C4]) → self::C6
-    : super self::S6::•()
+  constructor •([core::int? x = #C4]) → self::C6
+    : super self::S6::•(x)
     ;
 }
 class S7 extends core::Object {
diff --git a/pkg/front_end/testcases/super_parameters/default_values.dart.strong.transformed.expect b/pkg/front_end/testcases/super_parameters/default_values.dart.strong.transformed.expect
@@ -2,13 +2,10 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/super_parameters/default_values.dart:51:11: Error: Expected ']' before this.
+// pkg/front_end/testcases/super_parameters/default_values.dart:51:17: Error: The parameter 'x' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
+// Try adding either an explicit non-'null' default value or the 'required' modifier.
 //   C5([int super.x]); // Error.
-//           ^^^^^
-//
-// pkg/front_end/testcases/super_parameters/default_values.dart:61:10: Error: Expected ']' before this.
-//   C6([int? super.x]); // Ok.
-//          ^
+//                 ^
 //
 import self as self;
 import "dart:core" as core;
@@ -68,8 +65,8 @@ class S5 extends core::Object {
     ;
 }
 class C5 extends self::S5 {
-  constructor •([dynamic int = #C4]) → self::C5
-    : super self::S5::•()
+  constructor •([core::int x = #C4]) → self::C5
+    : super self::S5::•(x)
     ;
 }
 class S6 extends core::Object {
@@ -80,8 +77,8 @@ class S6 extends core::Object {
 }
 class C6 extends self::S6 {
   field core::int? b = null;
-  constructor •([dynamic int = #C4]) → self::C6
-    : super self::S6::•()
+  constructor •([core::int? x = #C4]) → self::C6
+    : super self::S6::•(x)
     ;
 }
 class S7 extends core::Object {
diff --git a/pkg/front_end/testcases/super_parameters/default_values.dart.weak.expect b/pkg/front_end/testcases/super_parameters/default_values.dart.weak.expect
@@ -2,13 +2,10 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/super_parameters/default_values.dart:51:11: Error: Expected ']' before this.
+// pkg/front_end/testcases/super_parameters/default_values.dart:51:17: Error: The parameter 'x' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
+// Try adding either an explicit non-'null' default value or the 'required' modifier.
 //   C5([int super.x]); // Error.
-//           ^^^^^
-//
-// pkg/front_end/testcases/super_parameters/default_values.dart:61:10: Error: Expected ']' before this.
-//   C6([int? super.x]); // Ok.
-//          ^
+//                 ^
 //
 import self as self;
 import "dart:core" as core;
@@ -68,8 +65,8 @@ class S5 extends core::Object {
     ;
 }
 class C5 extends self::S5 {
-  constructor •([dynamic int = #C4]) → self::C5
-    : super self::S5::•()
+  constructor •([core::int x = #C4]) → self::C5
+    : super self::S5::•(x)
     ;
 }
 class S6 extends core::Object {
@@ -80,8 +77,8 @@ class S6 extends core::Object {
 }
 class C6 extends self::S6 {
   field core::int? b = null;
-  constructor •([dynamic int = #C4]) → self::C6
-    : super self::S6::•()
+  constructor •([core::int? x = #C4]) → self::C6
+    : super self::S6::•(x)
     ;
 }
 class S7 extends core::Object {
diff --git a/pkg/front_end/testcases/super_parameters/default_values.dart.weak.modular.expect b/pkg/front_end/testcases/super_parameters/default_values.dart.weak.modular.expect
@@ -2,13 +2,10 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/super_parameters/default_values.dart:51:11: Error: Expected ']' before this.
+// pkg/front_end/testcases/super_parameters/default_values.dart:51:17: Error: The parameter 'x' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
+// Try adding either an explicit non-'null' default value or the 'required' modifier.
 //   C5([int super.x]); // Error.
-//           ^^^^^
-//
-// pkg/front_end/testcases/super_parameters/default_values.dart:61:10: Error: Expected ']' before this.
-//   C6([int? super.x]); // Ok.
-//          ^
+//                 ^
 //
 import self as self;
 import "dart:core" as core;
@@ -68,8 +65,8 @@ class S5 extends core::Object {
     ;
 }
 class C5 extends self::S5 {
-  constructor •([dynamic int = #C4]) → self::C5
-    : super self::S5::•()
+  constructor •([core::int x = #C4]) → self::C5
+    : super self::S5::•(x)
     ;
 }
 class S6 extends core::Object {
@@ -80,8 +77,8 @@ class S6 extends core::Object {
 }
 class C6 extends self::S6 {
   field core::int? b = null;
-  constructor •([dynamic int = #C4]) → self::C6
-    : super self::S6::•()
+  constructor •([core::int? x = #C4]) → self::C6
+    : super self::S6::•(x)
     ;
 }
 class S7 extends core::Object {
diff --git a/pkg/front_end/testcases/super_parameters/default_values.dart.weak.outline.expect b/pkg/front_end/testcases/super_parameters/default_values.dart.weak.outline.expect
@@ -2,13 +2,10 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/super_parameters/default_values.dart:51:11: Error: Expected ']' before this.
+// pkg/front_end/testcases/super_parameters/default_values.dart:51:17: Error: The parameter 'x' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
+// Try adding either an explicit non-'null' default value or the 'required' modifier.
 //   C5([int super.x]); // Error.
-//           ^^^^^
-//
-// pkg/front_end/testcases/super_parameters/default_values.dart:61:10: Error: Expected ']' before this.
-//   C6([int? super.x]); // Ok.
-//          ^
+//                 ^
 //
 import self as self;
 import "dart:core" as core;
@@ -59,7 +56,7 @@ class S5 extends core::Object {
     ;
 }
 class C5 extends self::S5 {
-  constructor •([dynamic int]) → self::C5
+  constructor •([core::int x]) → self::C5
     ;
 }
 class S6 extends core::Object {
@@ -69,7 +66,7 @@ class S6 extends core::Object {
 }
 class C6 extends self::S6 {
   field core::int? b;
-  constructor •([dynamic int]) → self::C6
+  constructor •([core::int? x]) → self::C6
     ;
 }
 class S7 extends core::Object {
diff --git a/pkg/front_end/testcases/super_parameters/default_values.dart.weak.transformed.expect b/pkg/front_end/testcases/super_parameters/default_values.dart.weak.transformed.expect
@@ -2,13 +2,10 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/super_parameters/default_values.dart:51:11: Error: Expected ']' before this.
+// pkg/front_end/testcases/super_parameters/default_values.dart:51:17: Error: The parameter 'x' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.
+// Try adding either an explicit non-'null' default value or the 'required' modifier.
 //   C5([int super.x]); // Error.
-//           ^^^^^
-//
-// pkg/front_end/testcases/super_parameters/default_values.dart:61:10: Error: Expected ']' before this.
-//   C6([int? super.x]); // Ok.
-//          ^
+//                 ^
 //
 import self as self;
 import "dart:core" as core;
@@ -68,8 +65,8 @@ class S5 extends core::Object {
     ;
 }
 class C5 extends self::S5 {
-  constructor •([dynamic int = #C4]) → self::C5
-    : super self::S5::•()
+  constructor •([core::int x = #C4]) → self::C5
+    : super self::S5::•(x)
     ;
 }
 class S6 extends core::Object {
@@ -80,8 +77,8 @@ class S6 extends core::Object {
 }
 class C6 extends self::S6 {
   field core::int? b = null;
-  constructor •([dynamic int = #C4]) → self::C6
-    : super self::S6::•()
+  constructor •([core::int? x = #C4]) → self::C6
+    : super self::S6::•(x)
     ;
 }
 class S7 extends core::Object {

Original file line number	Diff line number	Diff line change
`@@ -1644,7 +1644,6 @@ class A {`
`1644`	`1644`	`);`
`1645`	`1645`	`}`
`1646`	`1646`
`1647`		`- @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/47951')`
`1648`	`1647`	`void test_superFormalParameter() {`
`1649`	`1648`	`var findNode = _parseStringToFindNode(r'''`
`1650`	`1649`	`class A {`
`@@ -1666,7 +1665,6 @@ class B extends A {`
`1666`	`1665`	`);`
`1667`	`1666`	`}`
`1668`	`1667`
`1669`		`- @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/47741')`
`1670`	`1668`	`void test_superFormalParameter_functionTyped() {`
`1671`	`1669`	`var findNode = _parseStringToFindNode(r'''`
`1672`	`1670`	`class A {`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,10 @@ library /isNonNullableByDefault/;`
`2`	`2`	`//`
`3`	`3`	`// Problems in library:`
`4`	`4`	`//`
`5`		`-// pkg/front_end/testcases/super_parameters/default_values.dart:51:11: Error: Expected ']' before this.`
	`5`	`+// pkg/front_end/testcases/super_parameters/default_values.dart:51:17: Error: The parameter 'x' can't have a value of 'null' because of its type 'int', but the implicit default value is 'null'.`
	`6`	`+// Try adding either an explicit non-'null' default value or the 'required' modifier.`
`6`	`7`	`// C5([int super.x]); // Error.`
`7`		`-// ^^^^^`
`8`		`-//`
`9`		`-// pkg/front_end/testcases/super_parameters/default_values.dart:61:10: Error: Expected ']' before this.`
`10`		`-// C6([int? super.x]); // Ok.`
`11`		`-// ^`
	`8`	`+// ^`
`12`	`9`	`//`
`13`	`10`	`import self as self;`
`14`	`11`	`import "dart:core" as core;`
`@@ -68,8 +65,8 @@ class S5 extends core::Object {`
`68`	`65`	`;`
`69`	`66`	`}`
`70`	`67`	`class C5 extends self::S5 {`
`71`		`- constructor •([dynamic int = #C4]) → self::C5`
`72`		`- : super self::S5::•()`
	`68`	`+ constructor •([core::int x = #C4]) → self::C5`
	`69`	`+ : super self::S5::•(x)`
`73`	`70`	`;`
`74`	`71`	`}`
`75`	`72`	`class S6 extends core::Object {`
`@@ -80,8 +77,8 @@ class S6 extends core::Object {`
`80`	`77`	`}`
`81`	`78`	`class C6 extends self::S6 {`
`82`	`79`	`field core::int? b = null;`
`83`		`- constructor •([dynamic int = #C4]) → self::C6`
`84`		`- : super self::S6::•()`
	`80`	`+ constructor •([core::int? x = #C4]) → self::C6`
	`81`	`+ : super self::S6::•(x)`
`85`	`82`	`;`
`86`	`83`	`}`
`87`	`84`	`class S7 extends core::Object {`