Skip to content

Commit 1c6a338

Browse files
committed
style: flatten nested conditionals in generate_commit
1 parent 386d482 commit 1c6a338

1 file changed

Lines changed: 18 additions & 21 deletions

File tree

src/app.rs

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -189,25 +189,23 @@ impl App {
189189
let is_interactive = std::io::stdout().is_terminal() && std::io::stdin().is_terminal();
190190

191191
// Step 3.5: Split detection
192-
if !self.cli.no_split {
193-
if is_interactive && !self.cli.yes {
194-
let suggestion = CommitSplitter::analyze(&changes, &symbols);
195-
196-
if let SplitSuggestion::SuggestSplit(groups) = suggestion {
197-
Self::display_split_suggestion(&groups, &changes);
198-
199-
let split_confirm = Confirm::new()
200-
.with_prompt("Split into separate commits?")
201-
.default(true)
202-
.interact()?;
203-
204-
if split_confirm {
205-
return self
206-
.run_split_flow(&git, groups, &changes, &symbols, &symbol_diffs)
207-
.await;
208-
}
209-
progress.info("Proceeding with single commit");
192+
if !self.cli.no_split && is_interactive && !self.cli.yes {
193+
let suggestion = CommitSplitter::analyze(&changes, &symbols);
194+
195+
if let SplitSuggestion::SuggestSplit(groups) = suggestion {
196+
Self::display_split_suggestion(&groups, &changes);
197+
198+
let split_confirm = Confirm::new()
199+
.with_prompt("Split into separate commits?")
200+
.default(true)
201+
.interact()?;
202+
203+
if split_confirm {
204+
return self
205+
.run_split_flow(&git, groups, &changes, &symbols, &symbol_diffs)
206+
.await;
210207
}
208+
progress.info("Proceeding with single commit");
211209
}
212210
}
213211

@@ -387,10 +385,9 @@ impl App {
387385
if let Some(edited) = Editor::new()
388386
.edit(&message)
389387
.map_err(|e| Error::Dialog(e.to_string()))?
388+
&& !edited.trim().is_empty()
390389
{
391-
if !edited.trim().is_empty() {
392-
message = edited;
393-
}
390+
message = edited;
394391
}
395392
}
396393
2 => {

0 commit comments

Comments
 (0)