Arrow turn into circle when new dest is origin square

Fixes #44
lichess-org · Aug 2, 2024 · 363d9d7 · 363d9d7
1 parent 26c3612
commit 363d9d7
Show file tree

Hide file tree

Showing 2 changed files with 94 additions and 1 deletion.
diff --git a/lib/src/models.dart b/lib/src/models.dart
@@ -161,7 +161,9 @@ class Arrow implements Shape {
 
   @override
   Shape newDest(Square newDest) {
-    return Arrow(color: color, orig: orig, dest: newDest, scale: scale);
+    return newDest == orig
+        ? Circle(color: color, orig: orig, scale: scale)
+        : Arrow(color: color, orig: orig, dest: newDest, scale: scale);
   }
 
   @override

diff --git a/test/models_test.dart b/test/models_test.dart
@@ -125,6 +125,55 @@ void main() {
       );
     });
 
+    test('Circle.newDest', () {
+      const circle = Circle(
+        color: Color(0xFF000000),
+        orig: Square.a1,
+      );
+
+      expect(
+        circle.newDest(Square.a2),
+        const Arrow(
+          color: Color(0xFF000000),
+          orig: Square.a1,
+          dest: Square.a2,
+        ),
+      );
+
+      expect(
+        circle.newDest(Square.a1),
+        const Circle(
+          color: Color(0xFF000000),
+          orig: Square.a1,
+        ),
+      );
+    });
+
+    test('Arrow.newDest', () {
+      const arrow = Arrow(
+        color: Color(0xFF000000),
+        orig: Square.a1,
+        dest: Square.a2,
+      );
+
+      expect(
+        arrow.newDest(Square.a3),
+        const Arrow(
+          color: Color(0xFF000000),
+          orig: Square.a1,
+          dest: Square.a3,
+        ),
+      );
+
+      expect(
+        arrow.newDest(Square.a1),
+        const Circle(
+          color: Color(0xFF000000),
+          orig: Square.a1,
+        ),
+      );
+    });
+
     test('copyWith', () {
       const arrow = Arrow(
         color: Color(0xFF000000),
@@ -181,4 +230,46 @@ void main() {
       );
     });
   });
+
+  group('Annotation', () {
+    test('implements hashCode/==', () {
+      expect(
+        const Annotation(symbol: '!', color: Color(0xFF000000)),
+        const Annotation(symbol: '!', color: Color(0xFF000000)),
+      );
+
+      expect(
+        const Annotation(symbol: '!', color: Color(0xFF000000)).hashCode,
+        const Annotation(symbol: '!', color: Color(0xFF000000)).hashCode,
+      );
+
+      expect(
+        const Annotation(symbol: '!', color: Color(0xFF000000)),
+        isNot(
+          const Annotation(symbol: '?', color: Color(0xFF000000)),
+        ),
+      );
+
+      expect(
+        const Annotation(symbol: '!', color: Color(0xFF000000)).hashCode,
+        isNot(
+          const Annotation(symbol: '?', color: Color(0xFF000000)).hashCode,
+        ),
+      );
+
+      expect(
+        const Annotation(symbol: '!', color: Color(0xFF000000)),
+        isNot(
+          const Annotation(symbol: '!', color: Color(0xFF000001)),
+        ),
+      );
+
+      expect(
+        const Annotation(symbol: '!', color: Color(0xFF000000)).hashCode,
+        isNot(
+          const Annotation(symbol: '!', color: Color(0xFF000001)).hashCode,
+        ),
+      );
+    });
+  });
 }