fix empty constructor contains {} bug

ebwood · Mar 11, 2024 · d8e69c3 · d8e69c3
1 parent 3b4e842
commit d8e69c3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/packages/rfw2txt/lib/rfw2txt.dart b/packages/rfw2txt/lib/rfw2txt.dart
@@ -1,13 +1,20 @@
 import 'dart:typed_data';
 
+import 'package:collection/collection.dart';
 import 'package:rfw/formats.dart';
 import 'package:rfw2txt/rwl2json.dart';
 import 'package:rfw2txt/rwl2txt.dart';
 
 // Parse .rfw to .rfwtxt
 String rfw2txt(Uint8List bytes) {
   RemoteWidgetLibrary rwl = decodeLibraryBlob(bytes);
-  return rwl2txt(rwl);
+  String output = rwl2txt(rwl);
+  if (ListEquality()
+          .equals(bytes, encodeLibraryBlob(parseLibraryFile(output))) ==
+      false) {
+    throw Exception('rfw2txt failed');
+  }
+  return output;
 }
 
 // Parse .rfw to json

diff --git a/packages/rfw2txt/lib/rwl2txt.dart b/packages/rfw2txt/lib/rwl2txt.dart
@@ -20,7 +20,8 @@ class TxtVisitor {
     buffer.writeln();
     // write widget declarations
     for (var element in library.widgets) {
-      buffer.writeln(_visitWidgetDeclaration(element));
+      buffer.write(_visitWidgetDeclaration(element));
+      buffer.write('\n\n');
     }
     return buffer.toString();
   }
@@ -87,9 +88,13 @@ class TxtVisitor {
     StringBuffer buffer = StringBuffer();
     if (node is ConstructorCall) {
       // ConstructorCall ignore arguments' curly braces
-      buffer.write('${node.name}(\n');
-      buffer.write(_visitDynamicMap(node.arguments, withoutCurlyBraces: true));
-      buffer.write(_leadingIndent);
+      buffer.write('${node.name}(');
+      if (node.arguments.isNotEmpty) {
+        buffer.write('\n');
+        buffer
+            .write(_visitDynamicMap(node.arguments, withoutCurlyBraces: true));
+        buffer.write(_leadingIndent);
+      }
       buffer.write(')');
     } else if (node is Switch) {
       buffer.write('switch ');

diff --git a/packages/rfw2txt/test/match.rfwtxt b/packages/rfw2txt/test/match.rfwtxt
@@ -1,6 +1,8 @@
 import core.widgets;
 import core.material;
 
+widget Empty = Container();
+
 widget Counter = Container(
   color: 0xFF66AACC,
   child: Center(

diff --git a/packages/rfw2txt/test/rfw2txt_test.dart b/packages/rfw2txt/test/rfw2txt_test.dart
@@ -30,11 +30,11 @@ void main() {
 
   test('rfw2txt with output path', () async {
     Process process = await Process.start('dart',
-        ['run', 'bin/rfw2txt.dart', "test/test.rfw", "-o", "test.rfwtxt"]);
+        ['run', 'bin/rfw2txt.dart', "test/test.rfw", "-o", "output.rfwtxt"]);
     await process.stdout.transform(utf8.decoder).forEach(print);
     await process.stderr.transform(utf8.decoder).forEach(print);
     File matchFile = File('test/test.rfw');
-    File outputTxtFile = File('test.rfwtxt');
+    File outputTxtFile = File('output.rfwtxt');
     File outputFile = File('output.rfw');
     outputFile.writeAsBytesSync(
         encodeLibraryBlob(parseLibraryFile(outputTxtFile.readAsStringSync())));

diff --git a/packages/rfw2txt/test/test.rfw b/packages/rfw2txt/test/test.rfw