chore: pass languageVersion to DartFormatter

halildurmus · Dec 9, 2024 · 8fc4d79 · 8fc4d79
1 parent d95b9ec
commit 8fc4d79
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/packages/generator/bin/generator.dart b/packages/generator/bin/generator.dart
@@ -42,7 +42,9 @@ int generateStructs(List<Scope> scopes, Map<String, String> structs) {
 
   final structsFile = [structFileHeader, ...structProjections].join();
 
-  file.writeAsStringSync(DartFormatter().format(structsFile));
+  file.writeAsStringSync(
+      DartFormatter(languageVersion: DartFormatter.latestLanguageVersion)
+          .format(structsFile));
   return structProjections.length;
 }
 
@@ -73,8 +75,9 @@ void generateDllFile(String library, List<Method> filteredMethods,
   ''');
   }
 
-  File('../win32/lib/src/win32/$libraryDartName.g.dart')
-      .writeAsStringSync(DartFormatter().format(buffer.toString()));
+  File('../win32/lib/src/win32/$libraryDartName.g.dart').writeAsStringSync(
+      DartFormatter(languageVersion: DartFormatter.latestLanguageVersion)
+          .format(buffer.toString()));
 }
 
 void generateFunctions(
@@ -127,8 +130,9 @@ void main() {
 }
 ''';
 
-  File('../win32/test/api_test.dart')
-      .writeAsStringSync(DartFormatter().format(testFile));
+  File('../win32/test/api_test.dart').writeAsStringSync(
+      DartFormatter(languageVersion: DartFormatter.latestLanguageVersion)
+          .format(testFile));
 }
 
 String generateFunctionTests(String library, Iterable<Method> methods,
@@ -211,7 +215,9 @@ void generateComApis(Scope scope, Map<String, String> comTypesToGenerate) {
         stripAnsiUnicodeSuffix(lastComponent(interface)).toLowerCase();
     final classOutputPath = '../win32/lib/src/com/$classOutputFilename.dart';
 
-    File(classOutputPath).writeAsStringSync(DartFormatter().format(dartClass));
+    File(classOutputPath).writeAsStringSync(
+        DartFormatter(languageVersion: DartFormatter.latestLanguageVersion)
+            .format(dartClass));
   }
 }
 

diff --git a/packages/generator/example/main.dart b/packages/generator/example/main.dart
@@ -71,7 +71,10 @@ void printComSetProperty(String interface, String propertyName) {
 }
 
 extension on Object {
-  String format() => DartFormatter(lineEnding: '\n').format(toString());
+  String format() => DartFormatter(
+        languageVersion: DartFormatter.latestLanguageVersion,
+        lineEnding: '\n',
+      ).format(toString());
 }
 
 void main() async {

diff --git a/packages/generator/test/goldens_test.dart b/packages/generator/test/goldens_test.dart
@@ -4,8 +4,8 @@ library;
 import 'dart:io';
 
 import 'package:dart_style/dart_style.dart';
-import 'package:test/test.dart';
 import 'package:generator/generator.dart';
+import 'package:test/test.dart';
 import 'package:winmd/winmd.dart';
 
 void main() {
@@ -48,5 +48,7 @@ extension on String {
   String convertLineEndingsToLF() => replaceAll('\r\n', '\n');
 
   /// Formats this string.
-  String format() => DartFormatter().format(this);
+  String format() =>
+      DartFormatter(languageVersion: DartFormatter.latestLanguageVersion)
+          .format(this);
 }