Merge pull request #62 from achilleasa/switch-to-dart-format

Switch to dart format
achilleasa · Sep 30, 2021 · 6615054 · 6615054
2 parents 2541d36 + b76b760
commit 6615054
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ jobs:
       script:
         - export PATH=$PATH:"${TRAVIS_HOME}/.pub-cache/bin"
         - pub get
-        - dartfmt -n --set-exit-if-changed .
+        - dart format --set-exit-if-changed .
         - dartanalyzer --fatal-warnings --fatal-hints --fatal-lints ./
         - AMQP_RUN_TLS_TESTS=true dart --pause-isolates-on-exit --disable-service-auth-codes --enable-vm-service=9292 test/run_all.dart &
         - pub global activate coverage

diff --git a/lib/src/protocol/messages/bindings/channel.dart b/lib/src/protocol/messages/bindings/channel.dart
@@ -148,6 +148,8 @@ class ChannelCloseOk implements Message {
   ChannelCloseOk.fromStream(TypeDecoder decoder) {}
   @override
   void serialize(TypeEncoder encoder) {
-    encoder..writeUInt16(msgClassId)..writeUInt16(msgMethodId);
+    encoder
+      ..writeUInt16(msgClassId)
+      ..writeUInt16(msgMethodId);
   }
 }
diff --git a/lib/src/protocol/messages/bindings/connection.dart b/lib/src/protocol/messages/bindings/connection.dart
@@ -245,6 +245,8 @@ class ConnectionCloseOk implements Message {
   ConnectionCloseOk.fromStream(TypeDecoder decoder) {}
   @override
   void serialize(TypeEncoder encoder) {
-    encoder..writeUInt16(msgClassId)..writeUInt16(msgMethodId);
+    encoder
+      ..writeUInt16(msgClassId)
+      ..writeUInt16(msgMethodId);
   }
 }
diff --git a/lib/src/protocol/messages/bindings/tx.dart b/lib/src/protocol/messages/bindings/tx.dart
@@ -22,7 +22,9 @@ class TxSelect implements Message {
 
   @override
   void serialize(TypeEncoder encoder) {
-    encoder..writeUInt16(msgClassId)..writeUInt16(msgMethodId);
+    encoder
+      ..writeUInt16(msgClassId)
+      ..writeUInt16(msgMethodId);
   }
 }
 
@@ -56,7 +58,9 @@ class TxCommit implements Message {
 
   @override
   void serialize(TypeEncoder encoder) {
-    encoder..writeUInt16(msgClassId)..writeUInt16(msgMethodId);
+    encoder
+      ..writeUInt16(msgClassId)
+      ..writeUInt16(msgMethodId);
   }
 }
 
@@ -90,7 +94,9 @@ class TxRollback implements Message {
 
   @override
   void serialize(TypeEncoder encoder) {
-    encoder..writeUInt16(msgClassId)..writeUInt16(msgMethodId);
+    encoder
+      ..writeUInt16(msgClassId)
+      ..writeUInt16(msgMethodId);
   }
 }
 

diff --git a/test/lib/auth_test.dart b/test/lib/auth_test.dart
@@ -120,7 +120,9 @@ class ConnectionCloseOkMock extends Mock implements ConnectionCloseOk {
 
   @override
   void serialize(TypeEncoder encoder) {
-    encoder..writeUInt16(msgClassId)..writeUInt16(msgMethodId);
+    encoder
+      ..writeUInt16(msgClassId)
+      ..writeUInt16(msgMethodId);
   }
 }
 

diff --git a/test/lib/exception_handling_test.dart b/test/lib/exception_handling_test.dart
@@ -103,7 +103,9 @@ class TxSelectOkMock extends Mock implements TxSelectOk {
 
   @override
   void serialize(TypeEncoder encoder) {
-    encoder..writeUInt16(msgClassId)..writeUInt16(msgMethodId);
+    encoder
+      ..writeUInt16(msgClassId)
+      ..writeUInt16(msgMethodId);
   }
 }
 

diff --git a/tool/generate_bindings.dart b/tool/generate_bindings.dart
@@ -333,15 +333,23 @@ ${String.fromCharCodes(List<int>.filled(className.length + methodName.length + 1
     }
 
     // End casacade
-    serializerMethod..write("    ;\n")..write("  }\n");
+    serializerMethod
+      ..write("    ;\n")
+      ..write("  }\n");
 
-    generatedClass..write("\n")..write(ctors);
+    generatedClass
+      ..write("\n")
+      ..write(ctors);
 
     if (implementedByServer || !implementedByClient) {
-      generatedClass..write("\n")..write(serializerMethod);
+      generatedClass
+        ..write("\n")
+        ..write(serializerMethod);
     } else {
       // Write an empty serializer stub to avoid warnings
-      generatedClass..write("\n\n")..write("""
+      generatedClass
+        ..write("\n\n")
+        ..write("""
   void serialize(TypeEncoder encoder) {}
 """);
     }