Update analyzer and CFE unit tests to use && and || in patterns.

In a follow-up CL I'll remove support for logical-and and logical-or patterns using `&` and `|`. Bug: dart-lang/language#2501 Change-Id: I2627cd9999ac703dd0ab63cd6be3d0d883860674 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/272920 Commit-Queue: Paul Berry <paulberry@google.com> Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
dart-lang · Dec 1, 2022 · 9221f34 · 9221f34
1 parent b0c705e
commit 9221f34
Show file tree

Hide file tree

Showing 31 changed files with 161 additions and 161 deletions.
diff --git a/pkg/analyzer/test/src/dart/ast/to_source_visitor_test.dart b/pkg/analyzer/test/src/dart/ast/to_source_visitor_test.dart
@@ -154,13 +154,13 @@ var v = a * (b + c);
     var findNode = _parseStringToFindNode('''
 void f(x) {
   switch (x) {
-    case int? _ & double? _ & Object? _:
+    case int? _ && double? _ && Object? _:
       break;
   }
 }
 ''');
     _assertSource(
-      'int? _ & double? _ & Object? _',
+      'int? _ && double? _ && Object? _',
       findNode.binaryPattern('Object?'),
     );
   }

diff --git a/pkg/analyzer/test/src/dart/resolution/binary_pattern_test.dart b/pkg/analyzer/test/src/dart/resolution/binary_pattern_test.dart
@@ -17,7 +17,7 @@ class BinaryPatternResolutionTest extends PubPackageResolutionTest {
   test_logicalAnd_ifCase() async {
     await assertNoErrorsInCode(r'''
 void f(x) {
-  if (x case int _ & double _) {}
+  if (x case int _ && double _) {}
 }
 ''');
     final node = findNode.singleGuardedPattern.pattern;
@@ -31,7 +31,7 @@ BinaryPattern
         staticType: null
       type: int
     name: _
-  operator: &
+  operator: &&
   rightOperand: VariablePattern
     type: NamedType
       name: SimpleIdentifier
@@ -47,7 +47,7 @@ BinaryPattern
     await assertNoErrorsInCode(r'''
 void f(x) {
   switch (x) {
-    case int _ & double _:
+    case int _ && double _:
       break;
   }
 }
@@ -63,7 +63,7 @@ BinaryPattern
         staticType: null
       type: int
     name: _
-  operator: &
+  operator: &&
   rightOperand: VariablePattern
     type: NamedType
       name: SimpleIdentifier
@@ -78,7 +78,7 @@ BinaryPattern
   test_logicalOr_ifCase() async {
     await assertNoErrorsInCode(r'''
 void f(x) {
-  if (x case int _ | double _) {}
+  if (x case int _ || double _) {}
 }
 ''');
     final node = findNode.singleGuardedPattern.pattern;
@@ -92,7 +92,7 @@ BinaryPattern
         staticType: null
       type: int
     name: _
-  operator: |
+  operator: ||
   rightOperand: VariablePattern
     type: NamedType
       name: SimpleIdentifier
@@ -108,7 +108,7 @@ BinaryPattern
     await assertNoErrorsInCode(r'''
 void f(x) {
   switch (x) {
-    case int _ | double _:
+    case int _ || double _:
       break;
   }
 }
@@ -124,7 +124,7 @@ BinaryPattern
         staticType: null
       type: int
     name: _
-  operator: |
+  operator: ||
   rightOperand: VariablePattern
     type: NamedType
       name: SimpleIdentifier