Skip to content

Fix spacetime generate running dotnet format in the wrong directory #3687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bfops merged 2 commits into from
Nov 18, 2025
Merged

Fix spacetime generate running dotnet format in the wrong directory #3687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf205ea
[bfops/fix-hanging-generate]: Fix `spacetime generate` running `dotne…
bfops Nov 18, 2025
144687e
[bfops/fix-hanging-generate]: comment
bfops Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/cli/src/subcommands/generate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ pub async fn exec_ex(
}
}

if let Err(err) = lang.format_files(paths) {
if let Err(err) = lang.format_files(out_dir, paths) {
// If we couldn't format the files, print a warning but don't fail the entire
// task as the output should still be usable, just less pretty.
eprintln!("Could not format generated files: {err}");
Expand Down Expand Up @@ -285,10 +285,10 @@ impl clap::ValueEnum for Language {
}

impl Language {
fn format_files(&self, generated_files: BTreeSet<PathBuf>) -> anyhow::Result<()> {
fn format_files(&self, project_dir: &PathBuf, generated_files: BTreeSet<PathBuf>) -> anyhow::Result<()> {
match self {
Language::Rust => rustfmt(generated_files)?,
Language::Csharp => dotnet_format(generated_files)?,
Language::Csharp => dotnet_format(project_dir, generated_files)?,
Language::TypeScript => {
// TODO: implement formatting.
}
Expand Down
4 changes: 3 additions & 1 deletion crates/cli/src/tasks/csharp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ pub(crate) fn build_csharp(project_path: &Path, build_debug: bool) -> anyhow::Re
anyhow::bail!("Built project successfully but couldn't find the output file.");
}

pub(crate) fn dotnet_format(files: impl IntoIterator<Item = PathBuf>) -> anyhow::Result<()> {
pub(crate) fn dotnet_format(project_dir: &PathBuf, files: impl IntoIterator<Item = PathBuf>) -> anyhow::Result<()> {
duct::cmd(
"dotnet",
itertools::chain(
Expand All @@ -128,6 +128,8 @@ pub(crate) fn dotnet_format(files: impl IntoIterator<Item = PathBuf>) -> anyhow:
files.into_iter().map_into(),
),
)
// This is important because we're running with `--folder`. We want to format the right folder!
.dir(project_dir)
.run()?;
Ok(())
}
Loading