#1096. Fix roll failures caused by wrong static errors expectations
diff --git a/Language/Libraries_and_Scripts/Exports/invalid_uri_t03.dart b/Language/Libraries_and_Scripts/Exports/invalid_uri_t03.dart
index 3b9acf0..37dca54 100644
--- a/Language/Libraries_and_Scripts/Exports/invalid_uri_t03.dart
+++ b/Language/Libraries_and_Scripts/Exports/invalid_uri_t03.dart
@@ -1,6 +1,4 @@
 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-//^
-// [cfe] unspecified
 // 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.
 
diff --git a/Language/Libraries_and_Scripts/Imports/invalid_uri_deferred_t01.dart b/Language/Libraries_and_Scripts/Imports/invalid_uri_deferred_t01.dart
index 749a5b1..7bbb647 100644
--- a/Language/Libraries_and_Scripts/Imports/invalid_uri_deferred_t01.dart
+++ b/Language/Libraries_and_Scripts/Imports/invalid_uri_deferred_t01.dart
@@ -1,6 +1,4 @@
 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
-//^
-// [cfe] unspecified
 // 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.
 
diff --git a/Language/Libraries_and_Scripts/Imports/invalid_uri_t01.dart b/Language/Libraries_and_Scripts/Imports/invalid_uri_t01.dart
index a5fe07f..8800b46 100644
--- a/Language/Libraries_and_Scripts/Imports/invalid_uri_t01.dart
+++ b/Language/Libraries_and_Scripts/Imports/invalid_uri_t01.dart
@@ -1,6 +1,4 @@
 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file

-//^

-// [cfe] unspecified

 // 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.

 

diff --git a/Language/Libraries_and_Scripts/Parts/compilation_t10.dart b/Language/Libraries_and_Scripts/Parts/compilation_t10.dart
index 16f037f..c8823ae 100644
--- a/Language/Libraries_and_Scripts/Parts/compilation_t10.dart
+++ b/Language/Libraries_and_Scripts/Parts/compilation_t10.dart
@@ -1,6 +1,4 @@
 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-//^
-// [cfe] unspecified
 // 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.
 
diff --git a/Language/Libraries_and_Scripts/Scripts/syntax_t02.dart b/Language/Libraries_and_Scripts/Scripts/syntax_t02.dart
index 81d12c6..38c9b1d 100644
--- a/Language/Libraries_and_Scripts/Scripts/syntax_t02.dart
+++ b/Language/Libraries_and_Scripts/Scripts/syntax_t02.dart
@@ -6,6 +6,7 @@
 //         ^
 // [analyzer] unspecified
 // [cfe] unspecified
+
 // Copyright (c) 2011, 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.
diff --git a/Language/Types/Type_Aliases/self_reference_t16.dart b/Language/Types/Type_Aliases/self_reference_t16.dart
index 54c2b28..0445d92 100644
--- a/Language/Types/Type_Aliases/self_reference_t16.dart
+++ b/Language/Types/Type_Aliases/self_reference_t16.dart
@@ -11,6 +11,7 @@
 

 typedef void F(G g);

 //           ^

+// [analyzer] unspecified

 // [cfe] unspecified

 typedef H G();

 //^

diff --git a/LanguageFeatures/int-to-double/return_value_fail_t02.dart b/LanguageFeatures/int-to-double/return_value_fail_t02.dart
index 71bfb77..a68210b 100644
--- a/LanguageFeatures/int-to-double/return_value_fail_t02.dart
+++ b/LanguageFeatures/int-to-double/return_value_fail_t02.dart
@@ -8,7 +8,6 @@
 /// precisely `double`
 /// @author sgrekhov@unipro.ru
 
-
 class C<X extends double> {
   X get instanceGetter1 => 42;
 //                         ^^
@@ -43,5 +42,11 @@
 main() {
   C<double> c = new C<double>();
   foo<double>();
+//^^^
+// [analyzer] unspecified
+// [cfe] unspecified
   foo<double>();
+//^^^
+// [analyzer] unspecified
+// [cfe] unspecified
 }
diff --git a/LanguageFeatures/nnbd/exports_A02_t01.dart b/LanguageFeatures/nnbd/exports_A02_t01.dart
index 85e4d4e..622a758 100644
--- a/LanguageFeatures/nnbd/exports_A02_t01.dart
+++ b/LanguageFeatures/nnbd/exports_A02_t01.dart
@@ -6,9 +6,9 @@
 /// an unmigrated library.
 /// @description Check that error is thrown if migrated library re-exports
 /// symbols from migrated one in the strong mode.
-/// @Issue 44545
 /// @author iarkh@unipro.ru
-
+/// @Issue 44545
+/// @Issue 44990
 // Requirements=nnbd-strong
 
 export "weak/exports_A02_opted_out_lib.dart";
diff --git a/LanguageFeatures/nnbd/null_aware_operator_A13_t13.dart b/LanguageFeatures/nnbd/null_aware_operator_A13_t13.dart
index 55a9903..3f460e6 100644
--- a/LanguageFeatures/nnbd/null_aware_operator_A13_t13.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A13_t13.dart
@@ -39,14 +39,14 @@
 
 void testShort(C? x, int index, dynamic value) {
   var actual = x?[index] ??= value;
-//                           ^
+//                           ^^^^^
 // [analyzer] STATIC_WARNING.DEAD_NULL_AWARE_EXPRESSION
 //               ^
 // [cfe] Operand of null-aware operation '??=' has type 'int' which excludes null.
   var n0 = x;
   x?.init();
   var expected = n0 == null ? null : n0[index] ??= value;
-//                                                 ^
+//                                                 ^^^^^
 // [analyzer] STATIC_WARNING.DEAD_NULL_AWARE_EXPRESSION
 //                                     ^
 // [cfe] Operand of null-aware operation '??=' has type 'int' which excludes null.
diff --git a/LanguageFeatures/nnbd/null_aware_operator_A17_t01.dart b/LanguageFeatures/nnbd/null_aware_operator_A17_t01.dart
index 24342c8..de763f8 100644
--- a/LanguageFeatures/nnbd/null_aware_operator_A17_t01.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A17_t01.dart
@@ -36,7 +36,7 @@
 main() {
   C c1 = new C();
   var actual1 = c1 ?.. test1;
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -45,7 +45,7 @@
   Expect.equals("test1 called 1 times, test2() called 0 times", c1.log);
 
   var actual2 = c1 ?.. test2();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -56,7 +56,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
     ?.. test1
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
     .. test2();
   Expect.equals(expected, actual3);
@@ -76,26 +76,26 @@
 
   c2 = new C();
   var actual7 = c2 ?.. test1;
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
   var expected2 = c2;
   Expect.equals(expected2, actual7);
   Expect.equals("test1 called 1 times, test2() called 0 times", c2?.log);
-//                                                                ^
+//                                                                ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                                                              ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
 
   var actual8 = c2 ?.. test2();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
   Expect.equals(expected2, actual8);
   Expect.equals("test1 called 1 times, test2() called 1 times", c2?.log);
-//                                                                ^
+//                                                                ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                                                              ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
@@ -104,12 +104,12 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
       ?.. test1
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. test2();
   Expect.equals(expected2, actual9);
   Expect.equals("test1 called 2 times, test2() called 2 times", c2?.log);
-//                                                                ^
+//                                                                ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                                                              ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
diff --git a/LanguageFeatures/nnbd/null_aware_operator_A17_t06.dart b/LanguageFeatures/nnbd/null_aware_operator_A17_t06.dart
index 289739d..438f676 100644
--- a/LanguageFeatures/nnbd/null_aware_operator_A17_t06.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A17_t06.dart
@@ -30,7 +30,7 @@
 main() {
   C c1 = new C();
   var actual1 = c1 ?.. test1 = "Show must go on";
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -39,7 +39,7 @@
   Expect.equals("Show must go on", c1.test1);
 
   var actual2 = c1 ?.. test2 = "Lily was here";
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -50,7 +50,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
     ?.. test1 = "Let it be"
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
     .. test2 = "Let it be";
   Expect.equals(expected, actual3);
@@ -71,26 +71,26 @@
 
   c2 = new C();
   var actual7 = c2 ?.. test1  = "Let it be";
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
   var expected2 = c2;
   Expect.equals(expected2, actual7);
   Expect.equals("Let it be", c2?.test1);
-//                             ^
+//                             ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                           ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
 
   var actual8 = c2 ?.. test2 = "Let it be";
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
   Expect.equals(expected2, actual8);
   Expect.equals("Let it be", c2?._test2);
-//                             ^
+//                             ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                           ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
@@ -99,17 +99,17 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
       ?.. test1 = "Show must go on"
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. test2 = "Show must go on";
   Expect.equals(expected2, actual9);
   Expect.equals("Show must go on", c2?.test1);
-//                                   ^
+//                                   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                                 ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
   Expect.equals("Show must go on", c2?._test2);
-//                                   ^
+//                                   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                                 ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
diff --git a/LanguageFeatures/nnbd/null_aware_operator_A17_t07.dart b/LanguageFeatures/nnbd/null_aware_operator_A17_t07.dart
index 3cc3d37..17bf878 100644
--- a/LanguageFeatures/nnbd/null_aware_operator_A17_t07.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A17_t07.dart
@@ -45,7 +45,7 @@
 main() {
   C c1 = new C();
   var actual1 = c1 ?.. m1().m();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -57,7 +57,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
     ?.. m1().m()
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
     .. m2().m();
   Expect.equals(expected, actual3);
@@ -75,14 +75,14 @@
 
   c2 = new C();
   var actual7 = c2 ?.. m1().m();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
   var expected2 = c2;
   Expect.equals(expected2, actual7);
   Expect.equals(1, c2?.m1().counter);
-//                   ^
+//                   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                 ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
@@ -91,7 +91,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
       ?.. m1().m()
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. m2().m();
   Expect.equals(expected2, actual9);
diff --git a/LanguageFeatures/nnbd/null_aware_operator_A17_t08.dart b/LanguageFeatures/nnbd/null_aware_operator_A17_t08.dart
index 468fcb5..9af2edd 100644
--- a/LanguageFeatures/nnbd/null_aware_operator_A17_t08.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A17_t08.dart
@@ -45,7 +45,7 @@
 main() {
   C c1 = new C();
   var actual1 = c1 ?.. m1()?.m();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -60,7 +60,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
     ?.. m1()?.m()
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
     .. m2()?.m();
   Expect.equals(expected, actual2);
@@ -75,7 +75,7 @@
 
   c1.a1 = null;
   var actual3 = c1 ?.. m1()?.m();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -86,7 +86,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
       ?.. m1()?.m()
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. m2()?.m();
   Expect.equals(expected, actual4);
@@ -104,7 +104,7 @@
 //                ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
       ?.. m1()?.m()
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. m2()?.m();
     Expect.isNull(actual6);
@@ -112,14 +112,14 @@
 
   c2 = new C();
   var actual7 = c2 ?.. m1()?.m();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
   var expected2 = c2;
   Expect.equals(expected2, actual7);
   var val5 = c2?.m1();
-//             ^
+//             ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //           ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
@@ -131,7 +131,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
       ?.. m1()?.m()
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. m2()?.m();
   Expect.equals(expected2, actual8);
@@ -146,7 +146,7 @@
 
   c1.a1 = null;
   var actual9 = c1 ?.. m1()?.m();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -157,7 +157,7 @@
 //               ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
       ?.. m1()?.m()
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. m2()?.m();
   Expect.equals(expected, actual10);
diff --git a/LanguageFeatures/nnbd/null_check_operator_A01_t01.dart b/LanguageFeatures/nnbd/null_check_operator_A01_t01.dart
index 9b279ee..518bfb5 100644
--- a/LanguageFeatures/nnbd/null_check_operator_A01_t01.dart
+++ b/LanguageFeatures/nnbd/null_check_operator_A01_t01.dart
@@ -31,12 +31,12 @@
   Expect.throws(() {a!.foo();});
   Expect.throws(() {a![42];});
   Expect.throws(() {a!?.foo();});
-//                    ^
+//                    ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                   ^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
   Expect.throws(() {a!?[42];});
-//                    ^
+//                    ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                   ^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
diff --git a/LanguageFeatures/nnbd/null_check_operator_A06_t01.dart b/LanguageFeatures/nnbd/null_check_operator_A06_t01.dart
index 8f41dc1..27b90a4 100644
--- a/LanguageFeatures/nnbd/null_check_operator_A06_t01.dart
+++ b/LanguageFeatures/nnbd/null_check_operator_A06_t01.dart
@@ -43,13 +43,17 @@
 //    ^
 // [cfe] Operand of null-aware operation '!' has type 'A' which excludes null.
   new A()!?.foo();
-//        ^
+//       ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
+//    ^
+// [cfe] Operand of null-aware operation '!' has type 'A' which excludes null.
 //       ^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
   new A()!?[42];
-//        ^
+//       ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
+//    ^
+// [cfe] Operand of null-aware operation '!' has type 'A' which excludes null.
 //       ^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
   new A().getValue!;
@@ -60,8 +64,10 @@
 //    ^
 // [cfe] Operand of null-aware operation '!' has type 'A' which excludes null.
   new A()!?.s = "Lily was here";
-//        ^
+//       ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
+//    ^
+// [cfe] Operand of null-aware operation '!' has type 'A' which excludes null.
 //       ^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
   new A()![0] = "Lily was here";
@@ -70,8 +76,10 @@
 //    ^
 // [cfe] Operand of null-aware operation '!' has type 'A' which excludes null.
   new A()!?[0] = "Lily was here";
-//        ^
+//       ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
+//    ^
+// [cfe] Operand of null-aware operation '!' has type 'A' which excludes null.
 //       ^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
   Expect.throws(() {new A().getNull!;});
diff --git a/LanguageFeatures/nnbd/null_check_operator_A06_t02.dart b/LanguageFeatures/nnbd/null_check_operator_A06_t02.dart
index 18a8f08..5697c47 100644
--- a/LanguageFeatures/nnbd/null_check_operator_A06_t02.dart
+++ b/LanguageFeatures/nnbd/null_check_operator_A06_t02.dart
@@ -48,13 +48,17 @@
 //    ^
 // [cfe] Operand of null-aware operation '!' has type 'A<String>' which excludes null.
   new A<String>.named("Let's have fun")!?.foo();
-//                                      ^
+//                                     ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
+//    ^
+// [cfe] Operand of null-aware operation '!' has type 'A<String>' which excludes null.
 //                                     ^
 // [cfe] Operand of null-aware operation '?.' has type 'A<String>' which excludes null.
   new A<String>.named("Let's have fun")!?[42];
-//                                      ^
+//                                     ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
+//    ^
+// [cfe] Operand of null-aware operation '!' has type 'A<String>' which excludes null.
 //                                     ^
 // [cfe] Operand of null-aware operation '?.' has type 'A<String>' which excludes null.
   new A<String>.named("Let's have fun").getValue!;
@@ -65,8 +69,10 @@
 //    ^
 // [cfe] Operand of null-aware operation '!' has type 'A<String>' which excludes null.
   new A<String>.named("Let's have fun")!?.s = "Lily was here";
-//                                      ^
+//                                     ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
+//    ^
+// [cfe] Operand of null-aware operation '!' has type 'A<String>' which excludes null.
 //                                     ^
 // [cfe] Operand of null-aware operation '?.' has type 'A<String>' which excludes null.
   new A<String>.named("Let's have fun")![0] = "Lily was here";
@@ -75,8 +81,10 @@
 //    ^
 // [cfe] Operand of null-aware operation '!' has type 'A<String>' which excludes null.
   new A<String>.named("Let's have fun")!?[0] = "Lily was here";
-//                                      ^
+//                                     ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
+//    ^
+// [cfe] Operand of null-aware operation '!' has type 'A<String>' which excludes null.
 //                                     ^
 // [cfe] Operand of null-aware operation '?.' has type 'A<String>' which excludes null.
   Expect.throws(() {new A<String>.named("Let's have fun").getNull!;});
diff --git a/LanguageFeatures/nnbd/static_errors_A14_t03.dart b/LanguageFeatures/nnbd/static_errors_A14_t03.dart
index d8cf0a8..df1838b 100644
--- a/LanguageFeatures/nnbd/static_errors_A14_t03.dart
+++ b/LanguageFeatures/nnbd/static_errors_A14_t03.dart
@@ -24,24 +24,24 @@
 main() {
   Function f1 = foo;
   f1?.toString();
-//  ^
+//  ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'Function' which excludes null.
   f1 ?.. toString();
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?..' has type 'Function' which excludes null.
 
   Foo f2 = foo;
   f2?.toString();
-//  ^
+//  ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'void Function()' which excludes null.
   f2 ?.. toString();
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?..' has type 'void Function()' which excludes null.
diff --git a/LanguageFeatures/nnbd/static_errors_A14_t05.dart b/LanguageFeatures/nnbd/static_errors_A14_t05.dart
index b25eb33..5178568 100644
--- a/LanguageFeatures/nnbd/static_errors_A14_t05.dart
+++ b/LanguageFeatures/nnbd/static_errors_A14_t05.dart
@@ -24,17 +24,17 @@
 main() {
   A a = new A();
   a?.test();
-// ^
+// ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
   a ?.. test();
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?..' has type 'A' which excludes null.
   a?[0];
-// ^
+// ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
diff --git a/LanguageFeatures/nnbd/static_errors_A14_t13.dart b/LanguageFeatures/nnbd/static_errors_A14_t13.dart
index 9cdba7e..324b15a 100644
--- a/LanguageFeatures/nnbd/static_errors_A14_t13.dart
+++ b/LanguageFeatures/nnbd/static_errors_A14_t13.dart
@@ -23,12 +23,12 @@
 main() {
   FutureOr<A> a = new A();
   a?.toString();
-// ^
+// ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'FutureOr<A>' which excludes null.
   a ?.. toString();
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?..' has type 'FutureOr<A>' which excludes null.
diff --git a/LanguageFeatures/nnbd/static_errors_A17_t03.dart b/LanguageFeatures/nnbd/static_errors_A17_t03.dart
index b928c14..f00f01f 100644
--- a/LanguageFeatures/nnbd/static_errors_A17_t03.dart
+++ b/LanguageFeatures/nnbd/static_errors_A17_t03.dart
@@ -16,32 +16,32 @@
 void test(var x) {
   if (x is Never) {
     x?.toString();
-//   ^
+//   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?.' has type 'Never' which excludes null.
     x?.runtimeType;
-//   ^
+//   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?.' has type 'Never' which excludes null.
     x?.s = 1;
-//   ^
+//   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?.' has type 'Never' which excludes null.
     x?..toString();
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?..' has type 'Never' which excludes null.
     x?..runtimeType;
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?..' has type 'Never' which excludes null.
     x?..s = 1;
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?..' has type 'Never' which excludes null.
diff --git a/LanguageFeatures/nnbd/static_errors_A30_t04.dart b/LanguageFeatures/nnbd/static_errors_A30_t04.dart
index 1b15055..6a76aac 100644
--- a/LanguageFeatures/nnbd/static_errors_A30_t04.dart
+++ b/LanguageFeatures/nnbd/static_errors_A30_t04.dart
@@ -31,7 +31,7 @@
 main() {
   E e = E.three;
   switch (e) {
-//^
+//^^^^^^^^^^
 // [analyzer] STATIC_WARNING.MISSING_ENUM_CONSTANT_IN_SWITCH
     case E.one:
       true;
diff --git a/LanguageFeatures/nnbd/static_errors_A30_t07.dart b/LanguageFeatures/nnbd/static_errors_A30_t07.dart
index 04d697c..c961a7f 100644
--- a/LanguageFeatures/nnbd/static_errors_A30_t07.dart
+++ b/LanguageFeatures/nnbd/static_errors_A30_t07.dart
@@ -32,7 +32,7 @@
 main() {
   E? e = E.three;
   switch (e) {
-//^
+//^^^^^^^^^^
 // [analyzer] STATIC_WARNING.MISSING_ENUM_CONSTANT_IN_SWITCH
     case E.one:
       true;
diff --git a/LanguageFeatures/nnbd/static_errors_A30_t08.dart b/LanguageFeatures/nnbd/static_errors_A30_t08.dart
index a301567..25dec79 100644
--- a/LanguageFeatures/nnbd/static_errors_A30_t08.dart
+++ b/LanguageFeatures/nnbd/static_errors_A30_t08.dart
@@ -32,7 +32,7 @@
 main() {
   var e = E.three as E?;
   switch (e) {
-//^
+//^^^^^^^^^^
 // [analyzer] STATIC_WARNING.MISSING_ENUM_CONSTANT_IN_SWITCH
     case E.one:
       true;
diff --git a/LanguageFeatures/nnbd/syntax_A06_t01.dart b/LanguageFeatures/nnbd/syntax_A06_t01.dart
index 539c74c..979b77c 100644
--- a/LanguageFeatures/nnbd/syntax_A06_t01.dart
+++ b/LanguageFeatures/nnbd/syntax_A06_t01.dart
@@ -12,7 +12,6 @@
 /// @author sgrekhov@unipro.ru
 /// @issue 39865
 
-
 // Requirements=nnbd-strong
 
 import "../../Utils/expect.dart";
@@ -26,7 +25,7 @@
   Expect.isNull(c?[42]);
   c = new C();
   Expect.equals(4, c?[2]);
-//                  ^
+//                  ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                 ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A17_t04.dart b/LanguageFeatures/nnbd/type-aliases/static_errors_A17_t04.dart
index 91e43ba..648c66f 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A17_t04.dart
+++ b/LanguageFeatures/nnbd/type-aliases/static_errors_A17_t04.dart
@@ -20,32 +20,32 @@
 void test(var x) {
   if (x is Neverland) {
     x?.toString();
-//   ^
+//   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?.' has type 'Never' which excludes null.
     x?.runtimeType;
-//   ^
+//   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?.' has type 'Never' which excludes null.
     x?.s = 1;
-//   ^
+//   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?.' has type 'Never' which excludes null.
     x?..toString();
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?..' has type 'Never' which excludes null.
     x?..runtimeType;
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?..' has type 'Never' which excludes null.
     x?..s = 1;
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?..' has type 'Never' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/null_aware_operator_A13_t13.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A13_t13.dart
index 524530e..a43f498 100644
--- a/LanguageFeatures/nnbd/weak/null_aware_operator_A13_t13.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A13_t13.dart
@@ -39,14 +39,14 @@
 
 void testShort(C? x, int index, dynamic value) {
   var actual = x?[index] ??= value;
-//                           ^
+//                           ^^^^^
 // [analyzer] STATIC_WARNING.DEAD_NULL_AWARE_EXPRESSION
 //               ^
 // [cfe] Operand of null-aware operation '??=' has type 'int' which excludes null.
   var n0 = x;
   x?.init();
   var expected = n0 == null ? null : n0[index] ??= value;
-//                                                 ^
+//                                                 ^^^^^
 // [analyzer] STATIC_WARNING.DEAD_NULL_AWARE_EXPRESSION
 //                                     ^
 // [cfe] Operand of null-aware operation '??=' has type 'int' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t01.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t01.dart
index 938d4c6..6c3dd03 100644
--- a/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t01.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t01.dart
@@ -36,7 +36,7 @@
 main() {
   C c1 = new C();
   var actual1 = c1 ?.. test1;
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -45,7 +45,7 @@
   Expect.equals("test1 called 1 times, test2() called 0 times", c1.log);
 
   var actual2 = c1 ?.. test2();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -56,7 +56,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
     ?.. test1
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
     .. test2();
   Expect.equals(expected, actual3);
@@ -76,26 +76,26 @@
 
   c2 = new C();
   var actual7 = c2 ?.. test1;
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
   var expected2 = c2;
   Expect.equals(expected2, actual7);
   Expect.equals("test1 called 1 times, test2() called 0 times", c2?.log);
-//                                                                ^
+//                                                                ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                                                              ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
 
   var actual8 = c2 ?.. test2();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
   Expect.equals(expected2, actual8);
   Expect.equals("test1 called 1 times, test2() called 1 times", c2?.log);
-//                                                                ^
+//                                                                ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                                                              ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
@@ -104,12 +104,12 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
       ?.. test1
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. test2();
   Expect.equals(expected2, actual9);
   Expect.equals("test1 called 2 times, test2() called 2 times", c2?.log);
-//                                                                ^
+//                                                                ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                                                              ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t03.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t03.dart
index f965656..7209be9 100644
--- a/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t03.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t03.dart
@@ -23,7 +23,7 @@
   A a1 = new A();
 
   var actual1 = a1 ?.. test();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'A' which excludes null.
@@ -32,7 +32,7 @@
   Expect.equals("test() called 1 times, text2 called 0 times", a1.log);
 
   var actual2 = a1 ?.. text2;
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'A' which excludes null.
@@ -43,7 +43,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'A' which excludes null.
       ?.. test()
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. text2;
   Expect.equals(expected, actual3);
@@ -63,26 +63,26 @@
 
   a2 = new A();
   var actual7 = a2 ?.. test();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'A' which excludes null.
   var expected2 = a2;
   Expect.equals(expected2, actual7);
   Expect.equals("test() called 1 times, text2 called 0 times", a2?.log);
-//                                                               ^
+//                                                               ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                                                             ^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
 
   var actual8 = a2 ?.. text2;
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'A' which excludes null.
   Expect.equals(expected2, actual8);
   Expect.equals("test() called 1 times, text2 called 1 times", a2?.log);
-//                                                               ^
+//                                                               ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                                                             ^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
@@ -91,12 +91,12 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'A' which excludes null.
       ?.. test()
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. text2;
   Expect.equals(expected2, actual9);
   Expect.equals("test() called 2 times, text2 called 2 times", a2?.log);
-//                                                               ^
+//                                                               ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                                                             ^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t06.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t06.dart
index acb90fd..09d4aca 100644
--- a/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t06.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t06.dart
@@ -30,7 +30,7 @@
 main() {
   C c1 = new C();
   var actual1 = c1 ?.. test1 = "Show must go on";
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -39,7 +39,7 @@
   Expect.equals("Show must go on", c1.test1);
 
   var actual2 = c1 ?.. test2 = "Lily was here";
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -50,7 +50,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
     ?.. test1 = "Let it be"
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
     .. test2 = "Let it be";
   Expect.equals(expected, actual3);
@@ -71,26 +71,26 @@
 
   c2 = new C();
   var actual7 = c2 ?.. test1  = "Let it be";
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
   var expected2 = c2;
   Expect.equals(expected2, actual7);
   Expect.equals("Let it be", c2?.test1);
-//                             ^
+//                             ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                           ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
 
   var actual8 = c2 ?.. test2 = "Let it be";
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
   Expect.equals(expected2, actual8);
   Expect.equals("Let it be", c2?._test2);
-//                             ^
+//                             ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                           ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
@@ -99,17 +99,17 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
       ?.. test1 = "Show must go on"
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. test2 = "Show must go on";
   Expect.equals(expected2, actual9);
   Expect.equals("Show must go on", c2?.test1);
-//                                   ^
+//                                   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                                 ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
   Expect.equals("Show must go on", c2?._test2);
-//                                   ^
+//                                   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                                 ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t07.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t07.dart
index efb39d3..472e76d 100644
--- a/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t07.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t07.dart
@@ -45,7 +45,7 @@
 main() {
   C c1 = new C();
   var actual1 = c1 ?.. m1().m();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -57,7 +57,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
     ?.. m1().m()
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
     .. m2().m();
   Expect.equals(expected, actual3);
@@ -75,14 +75,14 @@
 
   c2 = new C();
   var actual7 = c2 ?.. m1().m();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
   var expected2 = c2;
   Expect.equals(expected2, actual7);
   Expect.equals(1, c2?.m1().counter);
-//                   ^
+//                   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                 ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
@@ -91,7 +91,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
       ?.. m1().m()
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. m2().m();
   Expect.equals(expected2, actual9);
diff --git a/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t08.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t08.dart
index 4c32bcd..2ad1396 100644
--- a/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t08.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t08.dart
@@ -45,7 +45,7 @@
 main() {
   C c1 = new C();
   var actual1 = c1 ?.. m1()?.m();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -60,7 +60,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
     ?.. m1()?.m()
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
     .. m2()?.m();
   Expect.equals(expected, actual2);
@@ -75,7 +75,7 @@
 
   c1.a1 = null;
   var actual3 = c1 ?.. m1()?.m();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -86,7 +86,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
       ?.. m1()?.m()
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. m2()?.m();
   Expect.equals(expected, actual4);
@@ -104,7 +104,7 @@
 //                ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
       ?.. m1()?.m()
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. m2()?.m();
     Expect.isNull(actual6);
@@ -112,14 +112,14 @@
 
   c2 = new C();
   var actual7 = c2 ?.. m1()?.m();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
   var expected2 = c2;
   Expect.equals(expected2, actual7);
   var val5 = c2?.m1();
-//             ^
+//             ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //           ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
@@ -131,7 +131,7 @@
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
       ?.. m1()?.m()
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. m2()?.m();
   Expect.equals(expected2, actual8);
@@ -146,7 +146,7 @@
 
   c1.a1 = null;
   var actual9 = c1 ?.. m1()?.m();
-//                 ^
+//                 ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //              ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
@@ -157,7 +157,7 @@
 //               ^
 // [cfe] Operand of null-aware operation '?..' has type 'C' which excludes null.
       ?.. m1()?.m()
-//    ^
+//    ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
       .. m2()?.m();
   Expect.equals(expected, actual10);
diff --git a/LanguageFeatures/nnbd/weak/null_check_operator_A01_t01.dart b/LanguageFeatures/nnbd/weak/null_check_operator_A01_t01.dart
index 9eab309..d967052 100644
--- a/LanguageFeatures/nnbd/weak/null_check_operator_A01_t01.dart
+++ b/LanguageFeatures/nnbd/weak/null_check_operator_A01_t01.dart
@@ -31,12 +31,12 @@
   Expect.throws(() {a!.foo();});
   Expect.throws(() {a![42];});
   Expect.throws(() {a!?.foo();});
-//                    ^
+//                    ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                   ^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
   Expect.throws(() {a!?[42];});
-//                    ^
+//                    ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                   ^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/static_errors_A14_t03.dart b/LanguageFeatures/nnbd/weak/static_errors_A14_t03.dart
index 0a79005..d3de914 100644
--- a/LanguageFeatures/nnbd/weak/static_errors_A14_t03.dart
+++ b/LanguageFeatures/nnbd/weak/static_errors_A14_t03.dart
@@ -24,24 +24,24 @@
 main() {
   Function f1 = foo;
   f1?.toString();
-//  ^
+//  ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'Function' which excludes null.
   f1 ?.. toString();
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?..' has type 'Function' which excludes null.
 
   Foo f2 = foo;
   f2?.toString();
-//  ^
+//  ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'void Function()' which excludes null.
   f2 ?.. toString();
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?..' has type 'void Function()' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/static_errors_A14_t05.dart b/LanguageFeatures/nnbd/weak/static_errors_A14_t05.dart
index af9068b..9e60f11 100644
--- a/LanguageFeatures/nnbd/weak/static_errors_A14_t05.dart
+++ b/LanguageFeatures/nnbd/weak/static_errors_A14_t05.dart
@@ -24,17 +24,17 @@
 main() {
   A a = new A();
   a?.test();
-// ^
+// ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
   a ?.. test();
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?..' has type 'A' which excludes null.
   a?[0];
-// ^
+// ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/static_errors_A14_t07.dart b/LanguageFeatures/nnbd/weak/static_errors_A14_t07.dart
index 4ba6d69..f13d0d0 100644
--- a/LanguageFeatures/nnbd/weak/static_errors_A14_t07.dart
+++ b/LanguageFeatures/nnbd/weak/static_errors_A14_t07.dart
@@ -20,17 +20,17 @@
 main() {
   A a = new A();
   a?.test();
-// ^
+// ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
   a ?.. test();
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?..' has type 'A' which excludes null.
   a?[0];
-// ^
+// ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/static_errors_A14_t08.dart b/LanguageFeatures/nnbd/weak/static_errors_A14_t08.dart
index 486207c..bd70629 100644
--- a/LanguageFeatures/nnbd/weak/static_errors_A14_t08.dart
+++ b/LanguageFeatures/nnbd/weak/static_errors_A14_t08.dart
@@ -26,17 +26,17 @@
 
   a = new A();
   a?.test();
-// ^
+// ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
   a ?.. test();
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?..' has type 'A' which excludes null.
   a?[0];
-// ^
+// ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/static_errors_A14_t10.dart b/LanguageFeatures/nnbd/weak/static_errors_A14_t10.dart
index 7561380..69a7169 100644
--- a/LanguageFeatures/nnbd/weak/static_errors_A14_t10.dart
+++ b/LanguageFeatures/nnbd/weak/static_errors_A14_t10.dart
@@ -21,12 +21,12 @@
 main() {
   FutureOr<A> a = new A();
   a?.toString();
-// ^
+// ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'FutureOr<A>' which excludes null.
   a ?.. toString();
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?..' has type 'FutureOr<A>' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/static_errors_A14_t13.dart b/LanguageFeatures/nnbd/weak/static_errors_A14_t13.dart
index b389283..2707847 100644
--- a/LanguageFeatures/nnbd/weak/static_errors_A14_t13.dart
+++ b/LanguageFeatures/nnbd/weak/static_errors_A14_t13.dart
@@ -23,12 +23,12 @@
 main() {
   FutureOr<A> a = new A();
   a?.toString();
-// ^
+// ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?.' has type 'FutureOr<A>' which excludes null.
   a ?.. toString();
-//  ^
+//  ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //^
 // [cfe] Operand of null-aware operation '?..' has type 'FutureOr<A>' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/static_errors_A17_t03.dart b/LanguageFeatures/nnbd/weak/static_errors_A17_t03.dart
index c5d0614..4a2176d 100644
--- a/LanguageFeatures/nnbd/weak/static_errors_A17_t03.dart
+++ b/LanguageFeatures/nnbd/weak/static_errors_A17_t03.dart
@@ -16,32 +16,32 @@
 void test(var x) {
   if (x is Never) {
     x?.toString();
-//   ^
+//   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?.' has type 'Never' which excludes null.
     x?.runtimeType;
-//   ^
+//   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?.' has type 'Never' which excludes null.
     x?.s = 1;
-//   ^
+//   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?.' has type 'Never' which excludes null.
     x?..toString();
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?..' has type 'Never' which excludes null.
     x?..runtimeType;
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?..' has type 'Never' which excludes null.
     x?..s = 1;
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?..' has type 'Never' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/static_errors_A30_t04.dart b/LanguageFeatures/nnbd/weak/static_errors_A30_t04.dart
index 37b63da..9dae61d 100644
--- a/LanguageFeatures/nnbd/weak/static_errors_A30_t04.dart
+++ b/LanguageFeatures/nnbd/weak/static_errors_A30_t04.dart
@@ -31,7 +31,7 @@
 main() {
   E e = E.three;
   switch (e) {
-//^
+//^^^^^^^^^^
 // [analyzer] STATIC_WARNING.MISSING_ENUM_CONSTANT_IN_SWITCH
     case E.one:
       true;
diff --git a/LanguageFeatures/nnbd/weak/static_errors_A30_t07.dart b/LanguageFeatures/nnbd/weak/static_errors_A30_t07.dart
index 06f1b1b..10a5acf 100644
--- a/LanguageFeatures/nnbd/weak/static_errors_A30_t07.dart
+++ b/LanguageFeatures/nnbd/weak/static_errors_A30_t07.dart
@@ -32,7 +32,7 @@
 main() {
   E? e = E.three;
   switch (e) {
-//^
+//^^^^^^^^^^
 // [analyzer] STATIC_WARNING.MISSING_ENUM_CONSTANT_IN_SWITCH
     case E.one:
       true;
diff --git a/LanguageFeatures/nnbd/weak/static_errors_A30_t08.dart b/LanguageFeatures/nnbd/weak/static_errors_A30_t08.dart
index 761c906..d54221f 100644
--- a/LanguageFeatures/nnbd/weak/static_errors_A30_t08.dart
+++ b/LanguageFeatures/nnbd/weak/static_errors_A30_t08.dart
@@ -32,7 +32,7 @@
 main() {
   var e = E.three as E?;
   switch (e) {
-//^
+//^^^^^^^^^^
 // [analyzer] STATIC_WARNING.MISSING_ENUM_CONSTANT_IN_SWITCH
     case E.one:
       true;
diff --git a/LanguageFeatures/nnbd/weak/syntax_A06_t01.dart b/LanguageFeatures/nnbd/weak/syntax_A06_t01.dart
index e5ee3e7..c2743ee 100644
--- a/LanguageFeatures/nnbd/weak/syntax_A06_t01.dart
+++ b/LanguageFeatures/nnbd/weak/syntax_A06_t01.dart
@@ -25,7 +25,7 @@
   Expect.isNull(c?[42]);
   c = new C();
   Expect.equals(4, c?[2]);
-//                  ^
+//                  ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                 ^
 // [cfe] Operand of null-aware operation '?.' has type 'C' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/syntax_A06_t03.dart b/LanguageFeatures/nnbd/weak/syntax_A06_t03.dart
index 39d2b45..4b1f4aa 100644
--- a/LanguageFeatures/nnbd/weak/syntax_A06_t03.dart
+++ b/LanguageFeatures/nnbd/weak/syntax_A06_t03.dart
@@ -22,7 +22,7 @@
   Expect.isNull(a?[42]);
   a = new A();
   Expect.equals(42, a?[42]);
-//                   ^
+//                   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //                  ^
 // [cfe] Operand of null-aware operation '?.' has type 'A' which excludes null.
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t04.dart b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t04.dart
index 01ca95f..7640b6f 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t04.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t04.dart
@@ -20,32 +20,32 @@
 void test(var x) {
   if (x is Neverland) {
     x?.toString();
-//   ^
+//   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?.' has type 'Never' which excludes null.
     x?.runtimeType;
-//   ^
+//   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?.' has type 'Never' which excludes null.
     x?.s = 1;
-//   ^
+//   ^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?.' has type 'Never' which excludes null.
     x?..toString();
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?..' has type 'Never' which excludes null.
     x?..runtimeType;
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?..' has type 'Never' which excludes null.
     x?..s = 1;
-//   ^
+//   ^^^
 // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
 //  ^
 // [cfe] Operand of null-aware operation '?..' has type 'Never' which excludes null.
diff --git a/LibTest/ffi/Array/Array_A02_t03.dart b/LibTest/ffi/Array/Array_A02_t03.dart
index 4ab3be3..1b3a5a7 100644
--- a/LibTest/ffi/Array/Array_A02_t03.dart
+++ b/LibTest/ffi/Array/Array_A02_t03.dart
@@ -32,8 +32,10 @@
   @Array(2)
 //^^^^^^^^^
 // [analyzer] unspecified
-// [cfe] unspecified
+
   external Array<Array<Int16>> a0;
+//                             ^
+// [cfe] unspecified
 }
 
 void main() {