Issue numbers added to the tests
diff --git a/LanguageFeatures/nnbd/null_aware_operator_A13_t03.dart b/LanguageFeatures/nnbd/null_aware_operator_A13_t03.dart
index ceb7bc1..e8703c4 100644
--- a/LanguageFeatures/nnbd/null_aware_operator_A13_t03.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A13_t03.dart
@@ -12,6 +12,7 @@
  * @description Check that assignments like e1?.[e2] *= e3 translates to:
  *  SHORT[EXP(e1), fn[x] => x[EXP(e2)] *= EXP(e3)]
  * @author sgrekhov@unipro.ru
+ * @issue 39866
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/null_aware_operator_A13_t13.dart b/LanguageFeatures/nnbd/null_aware_operator_A13_t13.dart
index e124ee4..430087b 100644
--- a/LanguageFeatures/nnbd/null_aware_operator_A13_t13.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A13_t13.dart
@@ -13,6 +13,7 @@
  *  SHORT[EXP(e1), fn[x] => x[EXP(e2)] ??= EXP(e3)]
  * @author sgrekhov@unipro.ru
  * @issue 40369
+ * @issue 40557
  * @static-warning
  */
 // SharedOptions=--enable-experiment=non-nullable
@@ -56,4 +57,4 @@
 
   C c2 = new C();
   testShort(c2, 0, 7);
-}
\ No newline at end of file
+}
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t01.dart b/LanguageFeatures/nnbd/static_errors_A06_t01.dart
index d61a6e5..fa8ce55 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t01.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t01.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test Never
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t02.dart b/LanguageFeatures/nnbd/static_errors_A06_t02.dart
index 0a40faf..7c7cb0a 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t02.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t02.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test Function
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t03.dart b/LanguageFeatures/nnbd/static_errors_A06_t03.dart
index b7ab9e8..329aaba 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t03.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t03.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test function type
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t04.dart b/LanguageFeatures/nnbd/static_errors_A06_t04.dart
index 49d3de7..795c8b1 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t04.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t04.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test some class A
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t05.dart b/LanguageFeatures/nnbd/static_errors_A06_t05.dart
index 784a6f9..be66188 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t05.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t05.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test some class A*
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t06.dart b/LanguageFeatures/nnbd/static_errors_A06_t06.dart
index 784a6f9..be66188 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t06.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t06.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test some class A*
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t07.dart b/LanguageFeatures/nnbd/static_errors_A06_t07.dart
index 81e69b4..d3b47b4 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t07.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t07.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test <T extends Object>
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t08.dart b/LanguageFeatures/nnbd/static_errors_A06_t08.dart
index 4e0d401..21cefed 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t08.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t08.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test FutureOr<Never>
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t09.dart b/LanguageFeatures/nnbd/static_errors_A06_t09.dart
index 91df3c7..fdcef10 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t09.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t09.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test FutureOr<Function>
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t10.dart b/LanguageFeatures/nnbd/static_errors_A06_t10.dart
index eda4ecc..e3b3919 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t10.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t10.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test FutureOr<Foo>, where Foo is a function type
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t11.dart b/LanguageFeatures/nnbd/static_errors_A06_t11.dart
index 6bc222c..bb77c66 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t11.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t11.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test FutureOr<A>, where A is some class
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t12.dart b/LanguageFeatures/nnbd/static_errors_A06_t12.dart
index c1b01c8..b109f03 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t12.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t12.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test FutureOr<A*>
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t13.dart b/LanguageFeatures/nnbd/static_errors_A06_t13.dart
index d62a4bf..0ff3a05 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t13.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t13.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test FutureOr<T> where <T extends Object>
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t14.dart b/LanguageFeatures/nnbd/static_errors_A06_t14.dart
index 911d67e..df71774 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t14.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t14.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test FutureOr<FutureOr<A>>, where A is some class
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t15.dart b/LanguageFeatures/nnbd/static_errors_A06_t15.dart
index e44e027..a20b506 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t15.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t15.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test <T extends Object?>
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A06_t16.dart b/LanguageFeatures/nnbd/static_errors_A06_t16.dart
index 6af5a3f..b6bcbff 100644
--- a/LanguageFeatures/nnbd/static_errors_A06_t16.dart
+++ b/LanguageFeatures/nnbd/static_errors_A06_t16.dart
@@ -12,6 +12,7 @@
  * function expression with a potentially non-nullable return type may complete
  * normally. Test F*, where F is a function type
  * @author sgrekhov@unipro.ru
+ * @issue 40396
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A30_t03.dart b/LanguageFeatures/nnbd/static_errors_A30_t03.dart
index 5c6cb29..6a9c6e0 100644
--- a/LanguageFeatures/nnbd/static_errors_A30_t03.dart
+++ b/LanguageFeatures/nnbd/static_errors_A30_t03.dart
@@ -13,6 +13,7 @@
  * @description Check that it is not an error if any case of a switch statement
  * may not complete normally
  * @author sgrekhov@unipro.ru
+ * @issue 40392
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A30_t04.dart b/LanguageFeatures/nnbd/static_errors_A30_t04.dart
index 9f6414a..0087112 100644
--- a/LanguageFeatures/nnbd/static_errors_A30_t04.dart
+++ b/LanguageFeatures/nnbd/static_errors_A30_t04.dart
@@ -13,6 +13,7 @@
  * @description Check that it is not an error if any case of a switch statement
  * may not complete normally
  * @author sgrekhov@unipro.ru
+ * @issue 40392
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A31_t04.dart b/LanguageFeatures/nnbd/static_errors_A31_t04.dart
index 3a4927d..f2dc6e4 100644
--- a/LanguageFeatures/nnbd/static_errors_A31_t04.dart
+++ b/LanguageFeatures/nnbd/static_errors_A31_t04.dart
@@ -23,6 +23,7 @@
  * @description Check that it is a warning if T is an enum type and the switch
  * does not handle all enum cases, either explicitly or via a default.
  * @author sgrekhov@unipro.ru
+ * @issue 40395
  * @static-warning
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/nnbd/static_errors_A31_t09.dart b/LanguageFeatures/nnbd/static_errors_A31_t09.dart
index 0a013f9..69f3d5d 100644
--- a/LanguageFeatures/nnbd/static_errors_A31_t09.dart
+++ b/LanguageFeatures/nnbd/static_errors_A31_t09.dart
@@ -23,6 +23,7 @@
  * @description Check that it is no warning if T is Q? where Q is an enum type
  * and the switch does handle all enum cases and null explicitly
  * @author sgrekhov@unipro.ru
+ * @issue 40394
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A31_t10.dart b/LanguageFeatures/nnbd/static_errors_A31_t10.dart
index 965dae0..63c99d9 100644
--- a/LanguageFeatures/nnbd/static_errors_A31_t10.dart
+++ b/LanguageFeatures/nnbd/static_errors_A31_t10.dart
@@ -23,6 +23,7 @@
  * @description Check that it is no warning if T is Q? where Q is an enum type
  * and the switch does handle all enum cases and null via default
  * @author sgrekhov@unipro.ru
+ * @issue 40394
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong
diff --git a/LanguageFeatures/nnbd/static_errors_A31_t11.dart b/LanguageFeatures/nnbd/static_errors_A31_t11.dart
index 1435d0e..d72a993 100644
--- a/LanguageFeatures/nnbd/static_errors_A31_t11.dart
+++ b/LanguageFeatures/nnbd/static_errors_A31_t11.dart
@@ -24,6 +24,7 @@
  * not handle null either explicitly or via a default. Test dynamic
  * @author sgrekhov@unipro.ru
  * @static-warning
+ * @issue https://github.com/dart-lang/language/issues/792
  */
 // SharedOptions=--enable-experiment=non-nullable
 // Requirements=nnbd-strong