refactor: Modernize switch; use switch-expressions and no break; (#3133)

Replaces the switch cases that can be replaces with switch expressions and removes `break;` where it isn't needed. https://dart.dev/language/branches#switch-statements
flame-engine · Apr 18, 2024 · b283b82 · b283b82
1 parent 69f5c38
commit b283b82
Show file tree

Hide file tree

Showing 29 changed files with 183 additions and 425 deletions.
diff --git a/doc/tutorials/klondike/app/lib/main.dart b/doc/tutorials/klondike/app/lib/main.dart
@@ -10,29 +10,16 @@ void main() {
   if (page.startsWith('?')) {
     page = page.substring(1);
   }
-  switch (page) {
-    case 'step2':
-      step2.main();
-      break;
-
-    case 'step3':
-      step3.main();
-      break;
-
-    case 'step4':
-      step4.main();
-      break;
-
-    case 'step5':
-      step5.main();
-      break;
-
-    default:
-      runApp(
+  return switch (page) {
+    'step2' => step2.main(),
+    'step3' => step3.main(),
+    'step4' => step4.main(),
+    'step5' => step5.main(),
+    _ => runApp(
         Directionality(
           textDirection: TextDirection.ltr,
-          child: Text('Error: unknown page name "$page"'),
+          child: Text('Error=> unknown page name "$page"'),
         ),
-      );
-  }
+      ),
+  };
 }
diff --git a/doc/tutorials/klondike/app/lib/step3/components/card.dart b/doc/tutorials/klondike/app/lib/step3/components/card.dart
@@ -97,37 +97,31 @@ class Card extends PositionComponent {
     switch (rank.value) {
       case 1:
         _drawSprite(canvas, suitSprite, 0.5, 0.5, scale: 2.5);
-        break;
       case 2:
         _drawSprite(canvas, suitSprite, 0.5, 0.25);
         _drawSprite(canvas, suitSprite, 0.5, 0.25, rotate: true);
-        break;
       case 3:
         _drawSprite(canvas, suitSprite, 0.5, 0.2);
         _drawSprite(canvas, suitSprite, 0.5, 0.5);
         _drawSprite(canvas, suitSprite, 0.5, 0.2, rotate: true);
-        break;
       case 4:
         _drawSprite(canvas, suitSprite, 0.3, 0.25);
         _drawSprite(canvas, suitSprite, 0.7, 0.25);
         _drawSprite(canvas, suitSprite, 0.3, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.25, rotate: true);
-        break;
       case 5:
         _drawSprite(canvas, suitSprite, 0.3, 0.25);
         _drawSprite(canvas, suitSprite, 0.7, 0.25);
         _drawSprite(canvas, suitSprite, 0.3, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.5, 0.5);
-        break;
       case 6:
         _drawSprite(canvas, suitSprite, 0.3, 0.25);
         _drawSprite(canvas, suitSprite, 0.7, 0.25);
         _drawSprite(canvas, suitSprite, 0.3, 0.5);
         _drawSprite(canvas, suitSprite, 0.7, 0.5);
         _drawSprite(canvas, suitSprite, 0.3, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.25, rotate: true);
-        break;
       case 7:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -136,7 +130,6 @@ class Card extends PositionComponent {
         _drawSprite(canvas, suitSprite, 0.7, 0.5);
         _drawSprite(canvas, suitSprite, 0.3, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.2, rotate: true);
-        break;
       case 8:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -146,7 +139,6 @@ class Card extends PositionComponent {
         _drawSprite(canvas, suitSprite, 0.3, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.5, 0.35, rotate: true);
-        break;
       case 9:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -157,7 +149,6 @@ class Card extends PositionComponent {
         _drawSprite(canvas, suitSprite, 0.7, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.3, 0.4, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.4, rotate: true);
-        break;
       case 10:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -169,16 +160,12 @@ class Card extends PositionComponent {
         _drawSprite(canvas, suitSprite, 0.5, 0.3, rotate: true);
         _drawSprite(canvas, suitSprite, 0.3, 0.4, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.4, rotate: true);
-        break;
       case 11:
         _drawSprite(canvas, suit.isRed ? redJack : blackJack, 0.5, 0.5);
-        break;
       case 12:
         _drawSprite(canvas, suit.isRed ? redQueen : blackQueen, 0.5, 0.5);
-        break;
       case 13:
         _drawSprite(canvas, suit.isRed ? redKing : blackKing, 0.5, 0.5);
-        break;
     }
   }
 

diff --git a/doc/tutorials/klondike/app/lib/step4/components/card.dart b/doc/tutorials/klondike/app/lib/step4/components/card.dart
@@ -105,37 +105,31 @@ class Card extends PositionComponent with DragCallbacks {
     switch (rank.value) {
       case 1:
         _drawSprite(canvas, suitSprite, 0.5, 0.5, scale: 2.5);
-        break;
       case 2:
         _drawSprite(canvas, suitSprite, 0.5, 0.25);
         _drawSprite(canvas, suitSprite, 0.5, 0.25, rotate: true);
-        break;
       case 3:
         _drawSprite(canvas, suitSprite, 0.5, 0.2);
         _drawSprite(canvas, suitSprite, 0.5, 0.5);
         _drawSprite(canvas, suitSprite, 0.5, 0.2, rotate: true);
-        break;
       case 4:
         _drawSprite(canvas, suitSprite, 0.3, 0.25);
         _drawSprite(canvas, suitSprite, 0.7, 0.25);
         _drawSprite(canvas, suitSprite, 0.3, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.25, rotate: true);
-        break;
       case 5:
         _drawSprite(canvas, suitSprite, 0.3, 0.25);
         _drawSprite(canvas, suitSprite, 0.7, 0.25);
         _drawSprite(canvas, suitSprite, 0.3, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.5, 0.5);
-        break;
       case 6:
         _drawSprite(canvas, suitSprite, 0.3, 0.25);
         _drawSprite(canvas, suitSprite, 0.7, 0.25);
         _drawSprite(canvas, suitSprite, 0.3, 0.5);
         _drawSprite(canvas, suitSprite, 0.7, 0.5);
         _drawSprite(canvas, suitSprite, 0.3, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.25, rotate: true);
-        break;
       case 7:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -144,7 +138,6 @@ class Card extends PositionComponent with DragCallbacks {
         _drawSprite(canvas, suitSprite, 0.7, 0.5);
         _drawSprite(canvas, suitSprite, 0.3, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.2, rotate: true);
-        break;
       case 8:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -154,7 +147,6 @@ class Card extends PositionComponent with DragCallbacks {
         _drawSprite(canvas, suitSprite, 0.3, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.5, 0.35, rotate: true);
-        break;
       case 9:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -165,7 +157,6 @@ class Card extends PositionComponent with DragCallbacks {
         _drawSprite(canvas, suitSprite, 0.7, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.3, 0.4, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.4, rotate: true);
-        break;
       case 10:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -177,16 +168,12 @@ class Card extends PositionComponent with DragCallbacks {
         _drawSprite(canvas, suitSprite, 0.5, 0.3, rotate: true);
         _drawSprite(canvas, suitSprite, 0.3, 0.4, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.4, rotate: true);
-        break;
       case 11:
         _drawSprite(canvas, suit.isRed ? redJack : blackJack, 0.5, 0.5);
-        break;
       case 12:
         _drawSprite(canvas, suit.isRed ? redQueen : blackQueen, 0.5, 0.5);
-        break;
       case 13:
         _drawSprite(canvas, suit.isRed ? redKing : blackKing, 0.5, 0.5);
-        break;
     }
   }
 

diff --git a/doc/tutorials/klondike/app/lib/step5/components/card.dart b/doc/tutorials/klondike/app/lib/step5/components/card.dart
@@ -143,37 +143,31 @@ class Card extends PositionComponent
     switch (rank.value) {
       case 1:
         _drawSprite(canvas, suitSprite, 0.5, 0.5, scale: 2.5);
-        break;
       case 2:
         _drawSprite(canvas, suitSprite, 0.5, 0.25);
         _drawSprite(canvas, suitSprite, 0.5, 0.25, rotate: true);
-        break;
       case 3:
         _drawSprite(canvas, suitSprite, 0.5, 0.2);
         _drawSprite(canvas, suitSprite, 0.5, 0.5);
         _drawSprite(canvas, suitSprite, 0.5, 0.2, rotate: true);
-        break;
       case 4:
         _drawSprite(canvas, suitSprite, 0.3, 0.25);
         _drawSprite(canvas, suitSprite, 0.7, 0.25);
         _drawSprite(canvas, suitSprite, 0.3, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.25, rotate: true);
-        break;
       case 5:
         _drawSprite(canvas, suitSprite, 0.3, 0.25);
         _drawSprite(canvas, suitSprite, 0.7, 0.25);
         _drawSprite(canvas, suitSprite, 0.3, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.5, 0.5);
-        break;
       case 6:
         _drawSprite(canvas, suitSprite, 0.3, 0.25);
         _drawSprite(canvas, suitSprite, 0.7, 0.25);
         _drawSprite(canvas, suitSprite, 0.3, 0.5);
         _drawSprite(canvas, suitSprite, 0.7, 0.5);
         _drawSprite(canvas, suitSprite, 0.3, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.25, rotate: true);
-        break;
       case 7:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -182,7 +176,6 @@ class Card extends PositionComponent
         _drawSprite(canvas, suitSprite, 0.7, 0.5);
         _drawSprite(canvas, suitSprite, 0.3, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.2, rotate: true);
-        break;
       case 8:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -192,7 +185,6 @@ class Card extends PositionComponent
         _drawSprite(canvas, suitSprite, 0.3, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.5, 0.35, rotate: true);
-        break;
       case 9:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -203,7 +195,6 @@ class Card extends PositionComponent
         _drawSprite(canvas, suitSprite, 0.7, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.3, 0.4, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.4, rotate: true);
-        break;
       case 10:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -215,16 +206,12 @@ class Card extends PositionComponent
         _drawSprite(canvas, suitSprite, 0.5, 0.3, rotate: true);
         _drawSprite(canvas, suitSprite, 0.3, 0.4, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.4, rotate: true);
-        break;
       case 11:
         _drawSprite(canvas, suit.isRed ? redJack : blackJack, 0.5, 0.5);
-        break;
       case 12:
         _drawSprite(canvas, suit.isRed ? redQueen : blackQueen, 0.5, 0.5);
-        break;
       case 13:
         _drawSprite(canvas, suit.isRed ? redKing : blackKing, 0.5, 0.5);
-        break;
     }
   }
 

diff --git a/doc/tutorials/klondike/step3.md b/doc/tutorials/klondike/step3.md
@@ -401,37 +401,31 @@ of drawing various sprites in different places on the card's face:
     switch (rank.value) {
       case 1:
         _drawSprite(canvas, suitSprite, 0.5, 0.5, scale: 2.5);
-        break;
       case 2:
         _drawSprite(canvas, suitSprite, 0.5, 0.25);
         _drawSprite(canvas, suitSprite, 0.5, 0.25, rotate: true);
-        break;
       case 3:
         _drawSprite(canvas, suitSprite, 0.5, 0.2);
         _drawSprite(canvas, suitSprite, 0.5, 0.5);
         _drawSprite(canvas, suitSprite, 0.5, 0.2, rotate: true);
-        break;
       case 4:
         _drawSprite(canvas, suitSprite, 0.3, 0.25);
         _drawSprite(canvas, suitSprite, 0.7, 0.25);
         _drawSprite(canvas, suitSprite, 0.3, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.25, rotate: true);
-        break;
       case 5:
         _drawSprite(canvas, suitSprite, 0.3, 0.25);
         _drawSprite(canvas, suitSprite, 0.7, 0.25);
         _drawSprite(canvas, suitSprite, 0.3, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.5, 0.5);
-        break;
       case 6:
         _drawSprite(canvas, suitSprite, 0.3, 0.25);
         _drawSprite(canvas, suitSprite, 0.7, 0.25);
         _drawSprite(canvas, suitSprite, 0.3, 0.5);
         _drawSprite(canvas, suitSprite, 0.7, 0.5);
         _drawSprite(canvas, suitSprite, 0.3, 0.25, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.25, rotate: true);
-        break;
       case 7:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -440,7 +434,6 @@ of drawing various sprites in different places on the card's face:
         _drawSprite(canvas, suitSprite, 0.7, 0.5);
         _drawSprite(canvas, suitSprite, 0.3, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.2, rotate: true);
-        break;
       case 8:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -450,7 +443,6 @@ of drawing various sprites in different places on the card's face:
         _drawSprite(canvas, suitSprite, 0.3, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.5, 0.35, rotate: true);
-        break;
       case 9:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -461,7 +453,6 @@ of drawing various sprites in different places on the card's face:
         _drawSprite(canvas, suitSprite, 0.7, 0.2, rotate: true);
         _drawSprite(canvas, suitSprite, 0.3, 0.4, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.4, rotate: true);
-        break;
       case 10:
         _drawSprite(canvas, suitSprite, 0.3, 0.2);
         _drawSprite(canvas, suitSprite, 0.7, 0.2);
@@ -473,16 +464,12 @@ of drawing various sprites in different places on the card's face:
         _drawSprite(canvas, suitSprite, 0.5, 0.3, rotate: true);
         _drawSprite(canvas, suitSprite, 0.3, 0.4, rotate: true);
         _drawSprite(canvas, suitSprite, 0.7, 0.4, rotate: true);
-        break;
       case 11:
         _drawSprite(canvas, suit.isRed? redJack : blackJack, 0.5, 0.5);
-        break;
       case 12:
         _drawSprite(canvas, suit.isRed? redQueen : blackQueen, 0.5, 0.5);
-        break;
       case 13:
         _drawSprite(canvas, suit.isRed? redKing : blackKing, 0.5, 0.5);
-        break;
     }
 ```