Fix SdkInitializerContext.package when calling dart format (#258)

phntmxyz · Jul 22, 2024 · 50e907c · 50e907c
1 parent ea519a9
commit 50e907c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/sidekick_core/lib/src/commands/format_command.dart b/sidekick_core/lib/src/commands/format_command.dart
@@ -106,6 +106,7 @@ class FormatCommand extends Command {
         lineLength: lineLength,
         files: allDartFiles,
         verify: verify,
+        workingDirectory: package.root,
       );
       _verifyThrow();
       return;
@@ -159,6 +160,7 @@ class FormatCommand extends Command {
     required int lineLength,
     required Iterable<File> files,
     bool verify = false,
+    Directory? workingDirectory,
   }) async {
     if (verify) {
       print("Verifying $name");
@@ -177,14 +179,15 @@ class FormatCommand extends Command {
         '-l',
         '$lineLength',
         if (!verify) '--fix',
-        ...files.map((file) => file.path),
+        ...files.map((file) => file.absolute.path),
         if (verify) '--set-exit-if-changed',
         if (verify) '--output=none',
       ],
       nothrow: verify,
       // Lines like `Changed x.dart`, `Formatted x files (y changed) in z seconds`
       // should only be printed when the change is actually written to the files (when verify is false)
       progress: progress,
+      workingDirectory: workingDirectory,
     );
     exitCode = completion.exitCode ?? 1;
     if (exitCode != 0) {

diff --git a/sidekick_core/test/format_command_test.dart b/sidekick_core/test/format_command_test.dart
@@ -128,6 +128,11 @@ name: moshi
         final runner = initializeSidekick(
           dartSdkPath: systemDartSdkPath(),
         );
+
+        SdkInitializerContext? sdkInitializerContext;
+        addSdkInitializer((context) {
+          sdkInitializerContext = context;
+        });
         runner.addCommand(FormatCommand());
         await runner.run(['format', '-p', 'moshi']);
 
@@ -136,6 +141,11 @@ name: moshi
           _dartFile140,
         );
         expect(dir.file('moshi/lib/main.dart').readAsStringSync(), _dartFile80);
+        expect(sdkInitializerContext!.packageDir!.name, 'moshi');
+        expect(
+          sdkInitializerContext!.workingDirectory!.path,
+          dir.directory('moshi').path,
+        );
       });
     });