[XL] Change in dart/sdk[main]: CQ. Migrate most tests from FastaParserTestCase to ParserDiagnosticsT...

0 views
Skip to first unread message

Johnni Winther (Gerrit)

unread,
Mar 9, 2026, 5:05:28 AM (22 hours ago) Mar 9
to Konstantin Shcheglov, Paul Berry, Commit Queue, dart-analys...@google.com, rev...@dartlang.org
Attention needed from Konstantin Shcheglov and Paul Berry

Johnni Winther voted and added 2 comments

Votes added by Johnni Winther

Code-Review+1

2 comments

File pkg/analyzer/test/generated/class_member_parser_test.dart
Line 93, Patchset 6 (Latest): m() async { await x;
}
Johnni Winther . unresolved

Should this be formatted as

    m() async {
      await x;
    }
    
instead?

Similarly in various cases below.

Line 227, Patchset 6 (Latest): if (await returnsFuture()) {}
else if (!await returnsFuture()) {}
}
}
Johnni Winther . unresolved

Should this be de-indented?

Similarly in various cases below.

Open in Gerrit

Related details

Attention is currently required from:
  • Konstantin Shcheglov
  • Paul Berry
Submit Requirements:
  • requirement satisfiedCode-Owners
  • requirement satisfiedCode-Review
  • requirement satisfiedReview-Enforcement
Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
Gerrit-MessageType: comment
Gerrit-Project: sdk
Gerrit-Branch: main
Gerrit-Change-Id: I436d320b98751c7263cb08ce500e6aa5da1bfcd1
Gerrit-Change-Number: 486440
Gerrit-PatchSet: 6
Gerrit-Owner: Konstantin Shcheglov <sche...@google.com>
Gerrit-Reviewer: Johnni Winther <johnni...@google.com>
Gerrit-Reviewer: Konstantin Shcheglov <sche...@google.com>
Gerrit-Reviewer: Paul Berry <paul...@google.com>
Gerrit-Attention: Paul Berry <paul...@google.com>
Gerrit-Attention: Konstantin Shcheglov <sche...@google.com>
Gerrit-Comment-Date: Mon, 09 Mar 2026 09:05:23 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
satisfied_requirement
open
diffy

Konstantin Shcheglov (Gerrit)

unread,
Mar 9, 2026, 1:56:26 PM (13 hours ago) Mar 9
to Johnni Winther, Paul Berry, Commit Queue, dart-analys...@google.com, rev...@dartlang.org
Attention needed from Paul Berry

Konstantin Shcheglov added 1 comment

File pkg/analyzer/test/generated/class_member_parser_test.dart
Line 93, Patchset 6: m() async { await x;
}
Johnni Winther . resolved

Should this be formatted as

    m() async {
      await x;
    }
    
instead?

Similarly in various cases below.

Konstantin Shcheglov

Done. I formatted all code snippets in this and two other files that I missed initially.

Open in Gerrit

Related details

Attention is currently required from:
  • Paul Berry
Submit Requirements:
  • requirement satisfiedCode-Owners
  • requirement satisfiedCode-Review
  • requirement satisfiedReview-Enforcement
Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
Gerrit-MessageType: comment
Gerrit-Project: sdk
Gerrit-Branch: main
Gerrit-Change-Id: I436d320b98751c7263cb08ce500e6aa5da1bfcd1
Gerrit-Change-Number: 486440
Gerrit-PatchSet: 7
Gerrit-Owner: Konstantin Shcheglov <sche...@google.com>
Gerrit-Reviewer: Johnni Winther <johnni...@google.com>
Gerrit-Reviewer: Konstantin Shcheglov <sche...@google.com>
Gerrit-Reviewer: Paul Berry <paul...@google.com>
Gerrit-Attention: Paul Berry <paul...@google.com>
Gerrit-Comment-Date: Mon, 09 Mar 2026 17:56:24 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Johnni Winther <johnni...@google.com>
satisfied_requirement
open
diffy

Konstantin Shcheglov (Gerrit)

unread,
Mar 9, 2026, 1:56:30 PM (13 hours ago) Mar 9
to Johnni Winther, Paul Berry, Commit Queue, dart-analys...@google.com, rev...@dartlang.org
Attention needed from Paul Berry

Konstantin Shcheglov voted Commit-Queue+2

Commit-Queue+2
Open in Gerrit

Related details

Attention is currently required from:
  • Paul Berry
Submit Requirements:
  • requirement satisfiedCode-Owners
  • requirement satisfiedCode-Review
  • requirement satisfiedReview-Enforcement
Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
Gerrit-MessageType: comment
Gerrit-Project: sdk
Gerrit-Branch: main
Gerrit-Change-Id: I436d320b98751c7263cb08ce500e6aa5da1bfcd1
Gerrit-Change-Number: 486440
Gerrit-PatchSet: 7
Gerrit-Owner: Konstantin Shcheglov <sche...@google.com>
Gerrit-Reviewer: Johnni Winther <johnni...@google.com>
Gerrit-Reviewer: Konstantin Shcheglov <sche...@google.com>
Gerrit-Reviewer: Paul Berry <paul...@google.com>
Gerrit-Attention: Paul Berry <paul...@google.com>
Gerrit-Comment-Date: Mon, 09 Mar 2026 17:56:28 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
satisfied_requirement
open
diffy

Konstantin Shcheglov (Gerrit)

unread,
Mar 9, 2026, 2:17:01 PM (13 hours ago) Mar 9
to Johnni Winther, Paul Berry, Commit Queue, dart-analys...@google.com, rev...@dartlang.org
Gerrit-Comment-Date: Mon, 09 Mar 2026 18:16:59 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
satisfied_requirement
open
diffy

Konstantin Shcheglov (Gerrit)

unread,
Mar 9, 2026, 3:05:13 PM (12 hours ago) Mar 9
to Johnni Winther, Paul Berry, Commit Queue, dart-analys...@google.com, rev...@dartlang.org

Konstantin Shcheglov submitted the change with unreviewed changes

Unreviewed changes

6 is the latest approved patch-set.
The change was submitted with unreviewed changes in the following files:

```
The name of the file: pkg/analyzer/test/generated/top_level_parser_test.dart
Insertions: 65, Deletions: 30.

@@ -52,7 +52,9 @@
   void
   test_function_literal_allowed_in_ArgumentList_in_ConstructorFieldInitializer() {
     var parseResult = parseStringWithErrors(r'''
-class C { C() : a = f(() {}); }
+class C {
+  C() : a = f(() {});
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -102,7 +104,9 @@
   void
   test_function_literal_allowed_in_IndexExpression_in_ConstructorFieldInitializer() {
     var parseResult = parseStringWithErrors(r'''
-class C { C() : a = x[() {}]; }
+class C {
+  C() : a = x[() {}];
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -150,7 +154,9 @@
   void
   test_function_literal_allowed_in_ListLiteral_in_ConstructorFieldInitializer() {
     var parseResult = parseStringWithErrors(r'''
-class C { C() : a = [() {}]; }
+class C {
+  C() : a = [() {}];
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -197,7 +203,9 @@
   void
   test_function_literal_allowed_in_MapLiteral_in_ConstructorFieldInitializer() {
     var parseResult = parseStringWithErrors(r'''
-class C { C() : a = {'key': () {}}; }
+class C {
+  C() : a = {'key': () {}};
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -249,7 +257,9 @@
   void
   test_function_literal_allowed_in_ParenthesizedExpression_in_ConstructorFieldInitializer() {
     var parseResult = parseStringWithErrors(r'''
-class C { C() : a = (() {}); }
+class C {
+  C() : a = (() {});
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -295,7 +305,9 @@
   void
   test_function_literal_allowed_in_StringInterpolation_in_ConstructorFieldInitializer() {
     var parseResult = parseStringWithErrors(r'''
-class C { C() : a = "${(){}}"; }
+class C {
+  C() : a = "${() {}}";
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -635,7 +647,11 @@
 
   void test_parseClassDeclaration_metadata() {
     var parseResult = parseStringWithErrors(r'''
-@A @B(2) @C.foo(3) @d.E.bar(4, 5) class X {}
+@A
+@B(2)
+...@C.foo(3)
+...@d.E.bar(4, 5)
+class X {}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -792,7 +808,9 @@
 
   void test_parseClassDeclaration_nonEmpty() {
     var parseResult = parseStringWithErrors(r'''
-class A {var f;}
+class A {
+  var f;
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -1049,6 +1067,7 @@
   void test_parseCompilationUnit_directives_multiple() {
     var parseResult = parseStringWithErrors(r'''
 library l;
+
 part 'a.dart';
 ''');
     parseResult.assertNoErrors();
@@ -1250,7 +1269,9 @@
   void test_parseCompilationUnit_skipFunctionBody_withInterpolation() {
     ParserTestCase.parseFunctionBodies = false;
     var parseResult = parseStringWithErrors(r'''
-f() { "${n}"; }
+f() {
+  "${n}";
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -2511,7 +2532,8 @@
 
   void test_parseDirective_library_annotation() {
     var parseResult = parseStringWithErrors(r'''
-@A library l;
+@A
+library l;
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -2535,7 +2557,8 @@
 
   void test_parseDirective_library_annotation2() {
     var parseResult = parseStringWithErrors(r'''
-@A library l;
+@A
+library l;
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -2745,7 +2768,11 @@
 
   void test_parseDirectives_annotations() {
     var parseResult = parseStringWithErrors(r'''
-@A library l; @B import 'foo.dart';
+@A
+library l;
+
+@B
+import 'foo.dart';
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -2780,7 +2807,9 @@
   void test_parseDirectives_complete() {
     var parseResult = parseStringWithErrors(r'''
 #! /bin/dart
+
 library l;
+
 class A {}
 ''');
     parseResult.assertNoErrors();
@@ -2854,6 +2883,7 @@
   void test_parseDirectives_multiple() {
     var parseResult = parseStringWithErrors(r'''
 library l;
+
 part 'a.dart';
 ''');
     parseResult.assertNoErrors();
@@ -2929,7 +2959,7 @@
 
   void test_parseEnumDeclaration_one() {
     var parseResult = parseStringWithErrors(r'''
-enum E {ONE}
+enum E { ONE }
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -2951,7 +2981,7 @@
 
   void test_parseEnumDeclaration_trailingComma() {
     var parseResult = parseStringWithErrors(r'''
-enum E {ONE,}
+enum E { ONE }
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -2973,7 +3003,7 @@
 
   void test_parseEnumDeclaration_two() {
     var parseResult = parseStringWithErrors(r'''
-enum E {ONE, TWO}
+enum E { ONE, TWO }
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -2998,7 +3028,7 @@
   void test_parseEnumDeclaration_withDocComment_onEnum() {
     var parseResult = parseStringWithErrors(r'''
 /// Doc
-enum E {ONE}
+enum E { ONE }
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -3025,7 +3055,7 @@
     var parseResult = parseStringWithErrors(r'''
 enum E {
   /// Doc
-  ONE
+  ONE,
 }
 ''');
     parseResult.assertNoErrors();
@@ -3054,7 +3084,7 @@
 enum E {
   /// Doc
   @annotation
-  ONE
+  ONE,
 }
 ''');
     parseResult.assertNoErrors();
@@ -3371,7 +3401,7 @@
 
   void test_parseFunctionDeclaration_metadata() {
     var parseResult = parseStringWithErrors(r'''
-T f(@A a, @B(2) Foo b, {@C.foo(3) c : 0, @d.E.bar(4, 5) x:0}) {}
+T f(@A a, @B(2) Foo b, {@C.foo(3) c: 0, @d.E.bar(4, 5) x: 0}) {}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -3557,7 +3587,7 @@
 
   void test_parseGenericTypeAlias_typeParameters2() {
     var parseResult = parseStringWithErrors(r'''
-typedef F<T>= T Function(T);
+typedef F<T> = T Function(T);
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -3590,7 +3620,7 @@
 
   void test_parseGenericTypeAlias_typeParameters3() {
     var parseResult = parseStringWithErrors(r'''
-typedef F<A,B,C> = Function(A a, B b, C c);
+typedef F<A, B, C> = Function(A a, B b, C c);
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -3634,7 +3664,7 @@
 
   void test_parseGenericTypeAlias_typeParameters3_gtEq() {
     var parseResult = parseStringWithErrors(r'''
-typedef F<A,B,C>=Function(A a, B b, C c);
+typedef F<A, B, C> = Function(A a, B b, C c);
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -3678,7 +3708,7 @@
 
   void test_parseGenericTypeAlias_typeParameters_extends() {
     var parseResult = parseStringWithErrors(r'''
-typedef F<A,B,C extends D<E>> = Function(A a, B b, C c);
+typedef F<A, B, C extends D<E>> = Function(A a, B b, C c);
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -3731,7 +3761,7 @@
 
   void test_parseGenericTypeAlias_typeParameters_extends3() {
     var parseResult = parseStringWithErrors(r'''
-typedef F<A,B,C extends D<E,G,H>> = Function(A a, B b, C c);
+typedef F<A, B, C extends D<E, G, H>> = Function(A a, B b, C c);
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -3788,7 +3818,7 @@
 
   void test_parseGenericTypeAlias_typeParameters_extends3_gtGtEq() {
     var parseResult = parseStringWithErrors(r'''
-typedef F<A,B,C extends D<E,G,H>>=Function(A a, B b, C c);
+typedef F<A, B, C extends D<E, G, H>> = Function(A a, B b, C c);
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -3845,7 +3875,7 @@
 
   void test_parseGenericTypeAlias_typeParameters_extends_gtGtEq() {
     var parseResult = parseStringWithErrors(r'''
-typedef F<A,B,C extends D<E>>=Function(A a, B b, C c);
+typedef F<A, B, C extends D<E>> = Function(A a, B b, C c);
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -4332,7 +4362,8 @@
 
   void test_parseMixinDeclaration_metadata() {
     var parseResult = parseStringWithErrors(r'''
-@Z mixin A {}
+@Z
+mixin A {}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -4440,7 +4471,10 @@
 mixin A {
   int f;
   int get g => f;
-  set s(int v) {f = v;}
+  set s(int v) {
+    f = v;
+  }
+
   int add(int v) => f = f + v;
 }
 ''');
@@ -5315,8 +5349,9 @@
   void test_parseTypeVariable_withDocumentationComment() {
     var parseResult = parseStringWithErrors(r'''
 class A<
-    /// Doc
-    B> {}
+  /// Doc
+  B
+> {}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
```
```
The name of the file: pkg/analyzer/test/generated/class_member_parser_test.dart
Insertions: 66, Deletions: 55.

@@ -39,8 +39,10 @@
   void test_parse_member_called_late() {
     var parseResult = parseStringWithErrors(r'''
 class C {
-  void late() { new C().late();
-} }
+  void late() {
+    new C().late();
+  }
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -90,8 +92,9 @@
   void test_parseAwaitExpression_asStatement_inAsync() {
     var parseResult = parseStringWithErrors(r'''
 class C {
-  m() async { await x;
-}
+  m() async {
+    await x;
+  }
 }
 ''');
     parseResult.assertNoErrors();
@@ -120,8 +123,9 @@
   void test_parseAwaitExpression_asStatement_inSync() {
     var parseResult = parseStringWithErrors(r'''
 class C {
-  m() { await x;
-}
+  m() {
+    await x;
+  }
 }
 ''');
     parseResult.assertNoErrors();
@@ -151,13 +155,14 @@
   void test_parseAwaitExpression_inSync() {
     var parseResult = parseStringWithErrors(r'''
 class C {
-  m() { return await x + await y;
-}
+  m() {
+    return await x + await y;
+  }
 }
 ''');
     parseResult.assertErrors([
-      error(diag.awaitInWrongContext, 25, 5),
-      error(diag.awaitInWrongContext, 35, 5),
+      error(diag.awaitInWrongContext, 29, 5),
+      error(diag.awaitInWrongContext, 39, 5),
     ]);
     var node = parseResult.findNode.singleClassMember;
     assertParsedNodeText(node, r'''
@@ -190,11 +195,12 @@
   void test_parseAwaitExpression_inSync_v1_49116() {
     var parseResult = parseStringWithErrors(r'''
 class C {
-  m() { await returnsFuture();
-}
+  m() {
+    await returnsFuture();
+  }
 }
 ''');
-    parseResult.assertErrors([error(diag.awaitInWrongContext, 18, 5)]);
+    parseResult.assertErrors([error(diag.awaitInWrongContext, 22, 5)]);
     var node = parseResult.findNode.singleClassMember;
     assertParsedNodeText(node, r'''
 MethodDeclaration
@@ -224,14 +230,14 @@
     var parseResult = parseStringWithErrors(r'''
 class C {
   m() {
-      if (await returnsFuture()) {}
-      else if (!await returnsFuture()) {}
-    }
+    if (await returnsFuture()) {
+    } else if (!await returnsFuture()) {}
+  }
 }
 ''');
     parseResult.assertErrors([
-      error(diag.awaitInWrongContext, 28, 5),
-      error(diag.awaitInWrongContext, 70, 5),
+      error(diag.awaitInWrongContext, 26, 5),
+      error(diag.awaitInWrongContext, 67, 5),
     ]);
     var node = parseResult.findNode.singleClassMember;
     assertParsedNodeText(node, r'''
@@ -284,11 +290,12 @@
   void test_parseAwaitExpression_inSync_v3_49116() {
     var parseResult = parseStringWithErrors(r'''
 class C {
-  m() { print(await returnsFuture());
-}
+  m() {
+    print(await returnsFuture());
+  }
 }
 ''');
-    parseResult.assertErrors([error(diag.awaitInWrongContext, 24, 5)]);
+    parseResult.assertErrors([error(diag.awaitInWrongContext, 28, 5)]);
     var node = parseResult.findNode.singleClassMember;
     assertParsedNodeText(node, r'''
 MethodDeclaration
@@ -325,14 +332,14 @@
     var parseResult = parseStringWithErrors(r'''
 class C {
   m() {
-      xor(await returnsFuture(), await returnsFuture(), await returnsFuture());
-    }
+    xor(await returnsFuture(), await returnsFuture(), await returnsFuture());
+  }
 }
 ''');
     parseResult.assertErrors([
-      error(diag.awaitInWrongContext, 28, 5),
-      error(diag.awaitInWrongContext, 51, 5),
-      error(diag.awaitInWrongContext, 74, 5),
+      error(diag.awaitInWrongContext, 26, 5),
+      error(diag.awaitInWrongContext, 49, 5),
+      error(diag.awaitInWrongContext, 72, 5),
     ]);
     var node = parseResult.findNode.singleClassMember;
     assertParsedNodeText(node, r'''
@@ -386,13 +393,13 @@
     var parseResult = parseStringWithErrors(r'''
 class C {
   m() {
-      await returnsFuture() ^ await returnsFuture();
-    }
+    await returnsFuture() ^ await returnsFuture();
+  }
 }
 ''');
     parseResult.assertErrors([
-      error(diag.awaitInWrongContext, 24, 5),
-      error(diag.awaitInWrongContext, 48, 5),
+      error(diag.awaitInWrongContext, 22, 5),
+      error(diag.awaitInWrongContext, 46, 5),
     ]);
     var node = parseResult.findNode.singleClassMember;
     assertParsedNodeText(node, r'''
@@ -433,13 +440,13 @@
     var parseResult = parseStringWithErrors(r'''
 class C {
   m() {
-      print(await returnsFuture() ^ await returnsFuture());
-    }
+    print(await returnsFuture() ^ await returnsFuture());
+  }
 }
 ''');
     parseResult.assertErrors([
-      error(diag.awaitInWrongContext, 30, 5),
-      error(diag.awaitInWrongContext, 54, 5),
+      error(diag.awaitInWrongContext, 28, 5),
+      error(diag.awaitInWrongContext, 52, 5),
     ]);
     var node = parseResult.findNode.singleClassMember;
     assertParsedNodeText(node, r'''
@@ -1000,7 +1007,7 @@
     var parseResult = parseStringWithErrors(r'''
 class C {
   /// Doc
-C();
+  C();
 }
 ''');
     parseResult.assertNoErrors();
@@ -1632,10 +1639,10 @@
 
   void test_parseClassMember_method_generic_returnType_complex() {
     var parseResult = parseStringWithErrors(r'''
-  class C {
-    Map<int, T> m<T>() => null;
-  }
-  ''');
+class C {
+  Map<int, T> m<T>() => null;
+}
+''');
     parseResult.assertNoErrors();
     var node =
         (parseResult.findNode.singleClassDeclaration.body as BlockClassBody)
@@ -2174,7 +2181,9 @@
 
   void test_parseClassMember_method_static_mixin() {
     var parseResult = parseStringWithErrors(r'''
-mixin C { static void m() {} }
+mixin C {
+  static void m() {}
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -2206,7 +2215,7 @@
   void test_parseClassMember_method_trailing_commas() {
     var parseResult = parseStringWithErrors(r'''
 class C {
-  void f(int x, int y,) {}
+  void f(int x, int y) {}
 }
 ''');
     parseResult.assertNoErrors();
@@ -2312,8 +2321,10 @@
   void test_parseClassMember_operator_gtgtgteq() {
     var parseResult = parseStringWithErrors(r'''
 class C {
-  foo(int value) { x >>>= value;
-} }
+  foo(int value) {
+    x >>>= value;
+  }
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.unit;
@@ -2522,7 +2533,7 @@
   void test_parseConstructor_assert() {
     var parseResult = parseStringWithErrors(r'''
 class C {
-  C(x, y) : _x = x, assert (x < y), _y = y;
+  C(x, y) : _x = x, assert(x < y), _y = y;
 }
 ''');
     parseResult.assertNoErrors();
@@ -3376,7 +3387,7 @@
     var parseResult = parseStringWithErrors(r'''
 class C {
   /// Doc
-T get a;
+  T get a;
 }
 ''');
     parseResult.assertNoErrors();
@@ -3399,7 +3410,7 @@
     var parseResult = parseStringWithErrors(r'''
 class C {
   /// Doc
-static T get a => 42;
+  static T get a => 42;
 }
 ''');
     parseResult.assertNoErrors();
@@ -3426,7 +3437,7 @@
     var parseResult = parseStringWithErrors(r'''
 class C {
   /// Doc
-static T a = 1, b, c = 3;
+  static T a = 1, b, c = 3;
 }
 ''');
     parseResult.assertNoErrors();
@@ -3461,7 +3472,7 @@
     var parseResult = parseStringWithErrors(r'''
 class C {
   /// Doc
-static var a = 1, b, c = 3;
+  static var a = 1, b, c = 3;
 }
 ''');
     parseResult.assertNoErrors();
@@ -3495,7 +3506,7 @@
     var parseResult = parseStringWithErrors(r'''
 class C {
   /// Doc
-T operator +(A a);
+  T operator +(A a);
 }
 ''');
     parseResult.assertNoErrors();
@@ -3525,10 +3536,10 @@
     var parseResult = parseStringWithErrors(r'''
 class C {
   /// Doc
-T set a(var x);
+  T set a(var x);
 }
 ''');
-    parseResult.assertErrors([error(diag.extraneousModifier, 28, 3)]);
+    parseResult.assertErrors([error(diag.extraneousModifier, 30, 3)]);
     var node = parseResult.findNode.singleClassMember;
     assertParsedNodeText(node, r'''
 MethodDeclaration
@@ -3554,10 +3565,10 @@
     var parseResult = parseStringWithErrors(r'''
 class C {
   /// Doc
-static T set a(var x) {}
+  static T set a(var x) {}
 }
 ''');
-    parseResult.assertErrors([error(diag.extraneousModifier, 35, 3)]);
+    parseResult.assertErrors([error(diag.extraneousModifier, 37, 3)]);
     var node = parseResult.findNode.singleClassMember;
     assertParsedNodeText(node, r'''
 MethodDeclaration
@@ -3587,8 +3598,8 @@
 class C {
   int f(
     /// Doc
-    int x) {}
-
+    int x,
+  ) {}
 }
 ''');
     parseResult.assertNoErrors();
```
```
The name of the file: pkg/analyzer/test/generated/statement_parser_test.dart
Insertions: 98, Deletions: 39.

@@ -310,7 +310,7 @@
   void test_parseAssertStatement() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  assert (x);
+  assert(x);
 }
 ''');
     parseResult.assertNoErrors();
@@ -333,7 +333,7 @@
   void test_parseAssertStatement_messageLowPrecedence() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  assert (x, throw "foo");
+  assert(x, throw "foo");
 }
 ''');
     parseResult.assertNoErrors();
@@ -361,7 +361,7 @@
   void test_parseAssertStatement_messageString() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  assert (x, "foo");
+  assert(x, "foo");
 }
 ''');
     parseResult.assertNoErrors();
@@ -387,7 +387,7 @@
   void test_parseAssertStatement_trailingComma_message() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  assert (x, "m",);
+  assert(x, "m");
 }
 ''');
     parseResult.assertNoErrors();
@@ -413,7 +413,7 @@
   void test_parseAssertStatement_trailingComma_noMessage() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  assert (x,);
+  assert(x);
 }
 ''');
     parseResult.assertNoErrors();
@@ -455,7 +455,9 @@
   void test_parseBlock_nonEmpty() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  {;}
+  {
+    ;
+  }
 }
 ''');
     parseResult.assertNoErrors();
@@ -477,8 +479,11 @@
   void test_parseBreakStatement_label() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  foo: while (true) { break foo;
-} }
+  foo:
+  while (true) {
+    break foo;
+  }
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.firstBlock;
@@ -514,8 +519,10 @@
   void test_parseBreakStatement_noLabel() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  while (true) { break;
-} }
+  while (true) {
+    break;
+  }
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.firstBlock;
@@ -543,8 +550,11 @@
   void test_parseContinueStatement_label() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  foo: while (true) { continue foo;
-} }
+  foo:
+  while (true) {
+    continue foo;
+  }
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.firstBlock;
@@ -580,8 +590,10 @@
   void test_parseContinueStatement_noLabel() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  while (true) { continue;
-} }
+  while (true) {
+    continue;
+  }
+}
 ''');
     parseResult.assertNoErrors();
     var node = parseResult.findNode.firstBlock;
@@ -1360,7 +1372,7 @@
   void test_parseForStatement_loop_i() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  for (var i = 0;;) {}
+  for (var i = 0; ;) {}
 }
 ''');
     parseResult.assertNoErrors();
@@ -1394,7 +1406,7 @@
   void test_parseForStatement_loop_i2() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  for (var i = 0;;) {}
+  for (var i = 0; ;) {}
 }
 ''');
     parseResult.assertNoErrors();
@@ -1428,7 +1440,7 @@
   void test_parseForStatement_loop_i_withMetadata() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  for (@A var i = 0;;) {}
+  for (@A var i = 0; ;) {}
 }
 ''');
     parseResult.assertNoErrors();
@@ -1467,7 +1479,7 @@
   void test_parseForStatement_loop_i_withMetadata2() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  for (@A var i = 0;;) {}
+  for (@A var i = 0; ;) {}
 }
 ''');
     parseResult.assertNoErrors();
@@ -1786,7 +1798,7 @@
   void test_parseForStatement_loop_iu() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  for (var i = 0;; i++) {}
+  for (var i = 0; ; i++) {}
 }
 ''');
     parseResult.assertNoErrors();
@@ -1825,7 +1837,7 @@
   void test_parseForStatement_loop_iu2() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  for (var i = 0;; i++) {}
+  for (var i = 0; ; i++) {}
 }
 ''');
     parseResult.assertNoErrors();
@@ -1864,7 +1876,7 @@
   void test_parseForStatement_loop_u() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  for (;; i++) {}
+  for (; ; i++) {}
 }
 ''');
     parseResult.assertNoErrors();
@@ -1895,7 +1907,7 @@
   void test_parseForStatement_loop_u2() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  for (;; i++) {}
+  for (; ; i++) {}
 }
 ''');
     parseResult.assertNoErrors();
@@ -2050,7 +2062,8 @@
   void test_parseIfStatement_else_block() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  if (x) {} else {}
+  if (x) {
+  } else {}
 }
 ''');
     parseResult.assertNoErrors();
@@ -2079,7 +2092,10 @@
   void test_parseIfStatement_else_emptyStatements() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  if (true) ; else ;
+  if (true)
+    ;
+  else
+    ;
 }
 ''');
     parseResult.assertNoErrors();
@@ -2106,7 +2122,10 @@
   void test_parseIfStatement_else_statement() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  if (x) f(x); else f(y);
+  if (x)
+    f(x);
+  else
+    f(y);
 }
 ''');
     parseResult.assertNoErrors();
@@ -2305,7 +2324,7 @@
   void test_parseNonLabeledStatement_const_map_nonEmpty() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  const {'a' : 1};
+  const {'a': 1};
 }
 ''');
     parseResult.assertNoErrors();
@@ -2610,7 +2629,9 @@
   void test_parseNonLabeledStatement_invokeFunctionExpression() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  (a) {return a + a;} (3);
+  (a) {
+    return a + a;
+  }(3);
 }
 ''');
     parseResult.assertNoErrors();
@@ -3120,7 +3141,7 @@
   void test_parseNonLabeledStatement_variableDeclaration_typeParam2() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  C<T /* ignored comment */ > v;
+  C<T /* ignored comment */> v;
 }
 ''');
     parseResult.assertNoErrors();
@@ -3405,7 +3426,9 @@
   void test_parseStatement_multipleLabels() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  l: m: return x;
+  l:
+  m:
+  return x;
 }
 ''');
     parseResult.assertNoErrors();
@@ -3457,7 +3480,8 @@
   void test_parseStatement_singleLabel() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  l: return x;
+  l:
+  return x;
 }
 ''');
     parseResult.assertNoErrors();
@@ -3484,7 +3508,10 @@
   void test_parseSwitchStatement_case() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  switch (a) {case 1: return "I";}
+  switch (a) {
+    case 1:
+      return "I";
+  }
 }
 ''');
     parseResult.assertNoErrors();
@@ -3546,7 +3573,12 @@
   void test_parseSwitchStatement_labeledCase() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  switch (a) {l1: l2: l3: case(1):}
+  switch (a) {
+    l1:
+    l2:
+    l3:
+    case (1):
+  }
 }
 ''');
     parseResult.assertNoErrors();
@@ -3594,7 +3626,13 @@
   void test_parseSwitchStatement_labeledCase2() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  switch (a) {l1: case 0: l2: case 1: return;}
+  switch (a) {
+    l1:
+    case 0:
+    l2:
+    case 1:
+      return;
+  }
 }
 ''');
     parseResult.assertNoErrors();
@@ -3647,7 +3685,12 @@
   void test_parseSwitchStatement_labeledDefault() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  switch (a) {l1: l2: l3: default:}
+  switch (a) {
+    l1:
+    l2:
+    l3:
+    default:
+  }
 }
 ''');
     parseResult.assertNoErrors();
@@ -3688,7 +3731,13 @@
   void test_parseSwitchStatement_labeledDefault2() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  switch (a) {l1: case 0: l2: default: return;}
+  switch (a) {
+    l1:
+    case 0:
+    l2:
+    default:
+      return;
+  }
 }
 ''');
     parseResult.assertNoErrors();
@@ -3737,7 +3786,13 @@
   void test_parseSwitchStatement_labeledStatementInCase() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  switch (a) {case 0: f(); l1: g(); break;}
+  switch (a) {
+    case 0:
+      f();
+      l1:
+      g();
+      break;
+  }
 }
 ''');
     parseResult.assertNoErrors();
@@ -3963,7 +4018,8 @@
   void test_parseTryStatement_catch_finally() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  try {} catch (e, s) {} finally {}
+  try {} catch (e, s) {
+  } finally {}
 }
 ''');
     parseResult.assertNoErrors();
@@ -4026,7 +4082,9 @@
   void test_parseTryStatement_multiple() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  try {} on NPE catch (e) {} on Error {} catch (e) {}
+  try {} on NPE catch (e) {
+  } on Error {
+  } catch (e) {}
 }
 ''');
     parseResult.assertNoErrors();
@@ -4142,7 +4200,8 @@
   void test_parseTryStatement_on_catch_finally() {
     var parseResult = parseStringWithErrors(r'''
 void f() {
-  try {} on Error catch (e, s) {} finally {}
+  try {} on Error catch (e, s) {
+  } finally {}
 }
 ''');
     parseResult.assertNoErrors();
```

Change information

Commit message:
CQ. Migrate most tests from FastaParserTestCase to ParserDiagnosticsTest.
Change-Id: I436d320b98751c7263cb08ce500e6aa5da1bfcd1
Reviewed-by: Johnni Winther <johnni...@google.com>
Files:
  • M pkg/analyzer/lib/src/dart/ast/ast.dart
  • M pkg/analyzer/lib/src/test_utilities/find_node.dart
  • M pkg/analyzer/test/generated/class_member_parser_test.dart
  • M pkg/analyzer/test/generated/collection_literal_parser_test.dart
  • M pkg/analyzer/test/generated/expression_parser_test.dart
  • M pkg/analyzer/test/generated/extension_methods_parser_test.dart
  • M pkg/analyzer/test/generated/function_reference_parser_test.dart
  • M pkg/analyzer/test/generated/generic_metadata_parser_test.dart
  • M pkg/analyzer/test/generated/new_as_identifier_parser_test.dart
  • M pkg/analyzer/test/generated/nnbd_parser_test.dart
  • M pkg/analyzer/test/generated/recovery_parser_test.dart
  • M pkg/analyzer/test/generated/simple_parser_test.dart
  • M pkg/analyzer/test/generated/statement_parser_test.dart
  • M pkg/analyzer/test/generated/top_level_parser_test.dart
  • M pkg/analyzer/test/generated/variance_parser_test.dart
  • M pkg/analyzer/test/src/diagnostics/parser_diagnostics.dart
  • M pkg/analyzer/test/src/summary/resolved_ast_printer.dart
Change size: XL
Delta: 17 files changed, 29176 insertions(+), 11521 deletions(-)
Branch: refs/heads/main
Submit Requirements:
  • requirement satisfiedCode-Review: +1 by Johnni Winther
Open in Gerrit
Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. DiffyGerrit
Gerrit-MessageType: merged
Gerrit-Project: sdk
Gerrit-Branch: main
Gerrit-Change-Id: I436d320b98751c7263cb08ce500e6aa5da1bfcd1
Gerrit-Change-Number: 486440
Gerrit-PatchSet: 8
open
diffy
satisfied_requirement
Reply all
Reply to author
Forward
0 new messages